Skip to content

Commit d6e1491

Browse files
otelbot[bot]laurit
andauthored
[release/v2.18.x] Shade io.opentelemetry.common package (#14283)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent ba69cd7 commit d6e1491

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ tasks.withType<ShadowJar>().configureEach {
2929
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
3030
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
3131
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
32+
relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
3233
}
3334

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

examples/distro/gradle/shadow.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ext.relocatePackages = { shadowJar ->
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")
1515
shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
16+
shadowJar.relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
1617

1718
// relocate the OpenTelemetry extensions that are used by instrumentation modules
1819
// 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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ tasks.withType<ShadowJar>().configureEach {
9696
relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
9797
relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
9898
relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
99+
relocate("io.opentelemetry.common", "io.opentelemetry.javaagent.shaded.io.opentelemetry.common")
99100
}
100101

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public class RemappingUrlConnection extends URLConnection {
2929
rule(
3030
"#io.opentelemetry.context",
3131
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.context"),
32+
rule(
33+
"#io.opentelemetry.common",
34+
"#io.opentelemetry.javaagent.shaded.io.opentelemetry.common"),
3235
rule(
3336
"#io.opentelemetry.instrumentation",
3437
"#io.opentelemetry.javaagent.shaded.instrumentation"),

0 commit comments

Comments
 (0)