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

Remove unneeded relocation rules (#11093)

This commit is contained in:
Lauri Tulmin 2024-04-11 09:18:01 +03:00 committed by GitHub
parent 9efbec6fd5
commit 82890ad300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
View File

@ -28,9 +28,7 @@ tasks.withType<ShadowJar>().configureEach {
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api") relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv") relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context") relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
} }
// relocate(the OpenTelemetry extensions that are used by instrumentation modules) // relocate(the OpenTelemetry extensions that are used by instrumentation modules)

2
examples/distro/gradle/shadow.gradle
View File

@ -12,9 +12,7 @@ ext.relocatePackages = { shadowJar ->
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
shadowJar.relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api") shadowJar.relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
shadowJar.relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv") shadowJar.relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
shadowJar.relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context") shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
shadowJar.relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
// relocate the OpenTelemetry extensions that are used by instrumentation modules // relocate the OpenTelemetry extensions that are used by instrumentation modules
// these extensions live in the AgentClassLoader, and are injected into the user's class loader // these extensions live in the AgentClassLoader, and are injected into the user's class loader

1
gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
View File

@ -97,7 +97,6 @@ tasks.withType<ShadowJar>().configureEach {
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api") relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv") relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context") relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
} }
// relocate(the OpenTelemetry extensions that are used by instrumentation modules) // relocate(the OpenTelemetry extensions that are used by instrumentation modules)

6
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java
View File

@ -35,12 +35,6 @@ public class RemappingUrlConnection extends URLConnection {
rule( rule(
"#io.opentelemetry.semconv", "#io.opentelemetry.semconv",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv"), "#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv"),
rule(
"#io.opentelemetry.semconv.incubating",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating"),
rule(
"#io.opentelemetry.extension.incubator",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator"),
rule( rule(
"#io.opentelemetry.contrib.awsxray", "#io.opentelemetry.contrib.awsxray",
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.contrib.awsxray"), "#io.opentelemetry.javaagent.shaded.io.opentelemetry.contrib.awsxray"),