diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a7e36d8773..2056841ddb 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -17,6 +17,7 @@ }, { "matchPackageNames": [ + "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator", "io.opentelemetry.proto:opentelemetry-proto", "io.opentelemetry.semconv:opentelemetry-semconv-incubating" ], diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index f1b76fb707..9b13223a8a 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -83,7 +83,7 @@ val DEPENDENCIES = listOf( "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", "io.github.netmikey.logunit:logunit-jul:2.0.0", "io.jaegertracing:jaeger-client:1.8.1", - "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.39.0-alpha", + "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.45.0-alpha", "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.30.0-alpha", "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha", "io.opentracing:opentracing-api:0.33.0", diff --git a/sdk-extensions/incubator/build.gradle.kts b/sdk-extensions/incubator/build.gradle.kts index 20e91bd2e5..7b89d8e94e 100644 --- a/sdk-extensions/incubator/build.gradle.kts +++ b/sdk-extensions/incubator/build.gradle.kts @@ -39,9 +39,7 @@ dependencies { testImplementation(project(":exporters:zipkin")) testImplementation(project(":sdk-extensions:jaeger-remote-sampler")) testImplementation(project(":extensions:trace-propagators")) - // As a part of the tests we check that we can parse examples without error. The https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yam contains a reference to the xray propagator - // TODO: add when updated to reflect new API locations - // testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") + testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") testImplementation("com.linecorp.armeria:armeria-junit5") testImplementation("com.google.guava:guava-testlib") diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java index 262270670c..d512ee9f6d 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java @@ -96,10 +96,7 @@ class DeclarativeConfigurationCreateTest { "client_certificate: .*\n", "client_certificate: " + clientCertificatePath.replace("\\", "\\\\") - + System.lineSeparator()) - // TODO: remove once updated ComponentProvider SPI contract implemented in - // https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-xray-propagator - .replaceAll("xray,", ""); + + System.lineSeparator()); InputStream is = new ByteArrayInputStream(rewrittenExampleContent.getBytes(StandardCharsets.UTF_8));