Skip to content

Commit 2cf5f01

Browse files
authored
Fix declarative config xray todo (#7226)
1 parent e6f90f5 commit 2cf5f01

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
},
1818
{
1919
"matchPackageNames": [
20+
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
2021
"io.opentelemetry.proto:opentelemetry-proto",
2122
"io.opentelemetry.semconv:opentelemetry-semconv-incubating"
2223
],

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ val DEPENDENCIES = listOf(
8383
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",
8484
"io.github.netmikey.logunit:logunit-jul:2.0.0",
8585
"io.jaegertracing:jaeger-client:1.8.1",
86-
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.39.0-alpha",
86+
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.45.0-alpha",
8787
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.30.0-alpha",
8888
"io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
8989
"io.opentracing:opentracing-api:0.33.0",

sdk-extensions/incubator/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ dependencies {
3939
testImplementation(project(":exporters:zipkin"))
4040
testImplementation(project(":sdk-extensions:jaeger-remote-sampler"))
4141
testImplementation(project(":extensions:trace-propagators"))
42-
// 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
43-
// TODO: add when updated to reflect new API locations
44-
// testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
42+
testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
4543
testImplementation("com.linecorp.armeria:armeria-junit5")
4644

4745
testImplementation("com.google.guava:guava-testlib")

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ void parseAndCreate_Examples(@TempDir Path tempDir)
9696
"client_certificate: .*\n",
9797
"client_certificate: "
9898
+ clientCertificatePath.replace("\\", "\\\\")
99-
+ System.lineSeparator())
100-
// TODO: remove once updated ComponentProvider SPI contract implemented in
101-
// https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-xray-propagator
102-
.replaceAll("xray,", "");
99+
+ System.lineSeparator());
103100
InputStream is =
104101
new ByteArrayInputStream(rewrittenExampleContent.getBytes(StandardCharsets.UTF_8));
105102

0 commit comments

Comments
 (0)