Skip to content

Commit 82890ad

Browse files
authored
Remove unneeded relocation rules (#11093)
1 parent 9efbec6 commit 82890ad

File tree

4 files changed

+0
-11
lines changed

4 files changed

+0
-11
lines changed

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

-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ tasks.withType<ShadowJar>().configureEach {
2828
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
2929
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
3030
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
31-
relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
3231
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
33-
relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
3432
}
3533

3634
// relocate(the OpenTelemetry extensions that are used by instrumentation modules)

examples/distro/gradle/shadow.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ ext.relocatePackages = { shadowJar ->
1212
// relocate(OpenTelemetry API) since these classes live in the bootstrap class loader
1313
shadowJar.relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
1414
shadowJar.relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
15-
shadowJar.relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating")
1615
shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
17-
shadowJar.relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
1816

1917
// relocate the OpenTelemetry extensions that are used by instrumentation modules
2018
// these extensions live in the AgentClassLoader, and are injected into the user's class loader

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

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ tasks.withType<ShadowJar>().configureEach {
9797
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
9898
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
9999
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
100-
relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator")
101100
}
102101

103102
// relocate(the OpenTelemetry extensions that are used by instrumentation modules)

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ public class RemappingUrlConnection extends URLConnection {
3535
rule(
3636
"#io.opentelemetry.semconv",
3737
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv"),
38-
rule(
39-
"#io.opentelemetry.semconv.incubating",
40-
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating"),
41-
rule(
42-
"#io.opentelemetry.extension.incubator",
43-
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator"),
4438
rule(
4539
"#io.opentelemetry.contrib.awsxray",
4640
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.contrib.awsxray"),

0 commit comments

Comments
 (0)