Shade trace propagators so they can be injected in instrumentation th… (#1892)

* Shade trace propagators so they can be injected in instrumentation that benefits from a hard-coded propagation format

* Runtime shade too
This commit is contained in:
Anuraag Agrawal 2020-12-14 14:52:21 +09:00 committed by GitHub
parent 61825a2cb4
commit c741eaa501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 1 deletions

View File

@ -30,7 +30,8 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule {
"io.opentelemetry.instrumentation.awssdk.v2_2.RequestType",
"io.opentelemetry.instrumentation.awssdk.v2_2.SdkRequestDecorator",
"io.opentelemetry.instrumentation.awssdk.v2_2.DbRequestDecorator",
"io.opentelemetry.instrumentation.awssdk.v2_2.TracingExecutionInterceptor"
"io.opentelemetry.instrumentation.awssdk.v2_2.TracingExecutionInterceptor",
"io.opentelemetry.extension.trace.propagation.AwsXRayPropagator"
};
}

View File

@ -73,6 +73,7 @@ shadowJar {
relocate "io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api"
relocate "io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi"
relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
relocate "io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"
// this is for instrumentation on opentelemetry-api itself
relocate "application.io.opentelemetry", "io.opentelemetry"

View File

@ -67,4 +67,5 @@ shadowJar {
relocate "io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api"
relocate "io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi"
relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
relocate "io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"
}

View File

@ -33,6 +33,9 @@ public class ExporterClassLoader extends URLClassLoader {
rule(
"#io.opentelemetry.context",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.context"),
rule(
"#io.opentelemetry.extension.trace.propagation",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"),
rule("#java.util.logging.Logger", "#io.opentelemetry.javaagent.bootstrap.PatchLogger"),
rule("#org.slf4j", "#io.opentelemetry.javaagent.slf4j"));

View File

@ -92,6 +92,7 @@ tasks.withType(ShadowJar).configureEach {
relocate "io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api"
relocate "io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi"
relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
relocate "io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"
}
dependencies {