open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix declarative config xray todo (#7226)

This commit is contained in:
jack-berg 2025-03-27 13:30:24 -05:00 committed by GitHub
parent e6f90f58ce
commit 2cf5f0128b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/renovate.json5 vendored
View File

@ -17,6 +17,7 @@
}, },
{ {
"matchPackageNames": [ "matchPackageNames": [
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
"io.opentelemetry.proto:opentelemetry-proto", "io.opentelemetry.proto:opentelemetry-proto",
"io.opentelemetry.semconv:opentelemetry-semconv-incubating" "io.opentelemetry.semconv:opentelemetry-semconv-incubating"
], ],

2
dependencyManagement/build.gradle.kts
View File

@ -83,7 +83,7 @@ val DEPENDENCIES = listOf(
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",
"io.github.netmikey.logunit:logunit-jul:2.0.0", "io.github.netmikey.logunit:logunit-jul:2.0.0",
"io.jaegertracing:jaeger-client:1.8.1", "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.semconv:opentelemetry-semconv-incubating:1.30.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha", "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
"io.opentracing:opentracing-api:0.33.0", "io.opentracing:opentracing-api:0.33.0",

4
sdk-extensions/incubator/build.gradle.kts
View File

@ -39,9 +39,7 @@ dependencies {
testImplementation(project(":exporters:zipkin")) testImplementation(project(":exporters:zipkin"))
testImplementation(project(":sdk-extensions:jaeger-remote-sampler")) testImplementation(project(":sdk-extensions:jaeger-remote-sampler"))
testImplementation(project(":extensions:trace-propagators")) 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 testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
// TODO: add when updated to reflect new API locations
// testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
testImplementation("com.linecorp.armeria:armeria-junit5") testImplementation("com.linecorp.armeria:armeria-junit5")
testImplementation("com.google.guava:guava-testlib") testImplementation("com.google.guava:guava-testlib")

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

@ -96,10 +96,7 @@ class DeclarativeConfigurationCreateTest {
"client_certificate: .*\n", "client_certificate: .*\n",
"client_certificate: " "client_certificate: "
+ clientCertificatePath.replace("\\", "\\\\") + clientCertificatePath.replace("\\", "\\\\")
+ System.lineSeparator()) + 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,", "");
InputStream is = InputStream is =
new ByteArrayInputStream(rewrittenExampleContent.getBytes(StandardCharsets.UTF_8)); new ByteArrayInputStream(rewrittenExampleContent.getBytes(StandardCharsets.UTF_8));