Skip to content

Commit

Permalink
bug: replace opentelemetry-sdk-extension-aws mentions
Browse files Browse the repository at this point in the history
It replaces :

```
io.opentelemetry:opentelemetry-sdk-extension-aws
```

with:

```
io.opentelemetry.contrib:opentelemetry-aws-resources
```

and:

```
io.opentelemetry.contrib:opentelemetry-aws-xray-propagator
```

see:

open-telemetry/opentelemetry-java#4945
open-telemetry/opentelemetry-java#4831

it updates to https://github.com/open-telemetry/opentelemetry-java-contrib 1.34.0-Alpha

> Version 1.34.0 targets the OpenTelemetry SDK 1.34.0.

As we are in 1.36.0 I think this is the correct version to use for it.
  • Loading branch information
sdelamo committed Apr 15, 2024
1 parent 676e24e commit 08ddb3f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Expand Up @@ -13,7 +13,7 @@ managed-opentelemetry-alpha = '1.36.0-alpha'
managed-opentelemetry-instrumentation = '1.33.1'
managed-opentelemetry-instrumentation-alpha = '1.33.1-alpha'
managed-opentelemetry-contrib-aws-xray = '1.34.0'
managed-opentelemetry-contrib-aws-resources = '1.31.0-alpha'
managed-opentelemetry-contrib-aws-resources = '1.34.0-alpha'
managed-opentelemetry-gcp-trace = '0.27.0-alpha'
managed-opentelemetry-semconv = '1.21.0-alpha'
managed-protobuf = '0.9.4'
Expand Down Expand Up @@ -44,6 +44,7 @@ micronaut-gradle-plugin = "4.3.5"
micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }

managed-opentelemetry-contrib-aws-xray = { module = 'io.opentelemetry.contrib:opentelemetry-aws-xray', version.ref = 'managed-opentelemetry-contrib-aws-xray'}
managed-opentelemetry-contrib-aws-xray-propagator = { module = 'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator', version.ref = 'managed-opentelemetry-contrib-aws-resources' }
managed-opentelemetry-contrib-aws-resources = { module = 'io.opentelemetry.contrib:opentelemetry-aws-resources', version.ref = 'managed-opentelemetry-contrib-aws-resources'}
managed-opentelemetry-gcp-trace = { module = 'com.google.cloud.opentelemetry:exporter-auto', version.ref = 'managed-opentelemetry-gcp-trace'}

Expand Down Expand Up @@ -81,7 +82,6 @@ opentelemetry-sdk-testing = { module = 'io.opentelemetry:opentelemetry-sdk-testi
opentelemetry-autoconfigure = { module = 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure' }
opentelemetry-exporter-zipkin = { module = 'io.opentelemetry:opentelemetry-exporter-zipkin', version.ref = 'managed-opentelemetry' }
opentelemetry-exporter-otlp = { module = 'io.opentelemetry:opentelemetry-exporter-otlp'}
opentelemetry-extension-aws = { module = 'io.opentelemetry:opentelemetry-extension-aws' }
opentelemetry-instrumentation-api = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api' }
opentelemetry-instrumentation-grpc = { module = 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6'}
opentelemetry-instrumentation-kafka-common = { module = 'io.opentelemetry.instrumentation:opentelemetry-kafka-clients-common'}
Expand Down
Expand Up @@ -2,7 +2,7 @@ https://aws-otel.github.io/docs/getting-started/java-sdk/trace-manual-instr#usin

To use AWS resource detectors include the following dependency:

dependency:opentelemetry-sdk-extension-aws[groupId=io.opentelemetry]
dependency:opentelemetry-aws-resources[groupId=io.opentelemetry.contrib]

and provide a bean of type api:tracing.opentelemetry.ResourceProvider[]

Expand Down
2 changes: 1 addition & 1 deletion src/main/docs/guide/opentelemetry/propagators.adoc
Expand Up @@ -2,7 +2,7 @@ In your project you can specify propagators that you want to use. The default on

To use https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader[AWS X-Ray] propagator inside your application you have to add next dependency in your project:

dependency:opentelemetry-extension-aws[scope="implementation", groupId="io.opentelemetry"]
dependency:opentelemetry-aws-xray-propagator[scope="implementation", groupId="io.opentelemetry.contrib"]

And the "xray" has to be added inside configuration file.

Expand Down
5 changes: 3 additions & 2 deletions test-suite-opentelemetry-xray/build.gradle.kts
Expand Up @@ -11,11 +11,12 @@ dependencies {
testImplementation(projects.micronautTracingOpentelemetryHttp)
testImplementation(libs.opentelemetry.exporter.otlp)
testImplementation(libs.opentelemetry.aws.sdk)
testImplementation(libs.opentelemetry.extension.aws)

testImplementation(libs.managed.opentelemetry.contrib.aws.xray.propagator)
testImplementation(libs.managed.opentelemetry.contrib.aws.resources)
testRuntimeOnly(libs.junit.engine)
testAnnotationProcessor(mn.micronaut.inject.java)
testImplementation(mnTest.micronaut.test.junit5)

}
tasks.withType<Test> {
useJUnitPlatform()
Expand Down

0 comments on commit 08ddb3f

Please sign in to comment.