Improve disableShadowRelocate

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

@@ -24,13 +24,13 @@ tasks.withType<ShadowJar>().configureEach {
       exclude("io.opentelemetry.instrumentation.resources.*")
       exclude("io.opentelemetry.instrumentation.spring.resources.*")
     }
-  }
 
-  // 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.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
-  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(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.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
+    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)
   // these extensions live in the AgentClassLoader, and are injected into the user's class loader

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -323,7 +323,12 @@ tasks.withType<Test>().configureEach {
   // propagation.
   jvmArgs("-Dio.opentelemetry.context.enableStrictContext=${rootProject.findProperty("enableStrictContext") ?: true}")
   // TODO(anuraaga): Have agent map unshaded to shaded.
-  jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=${rootProject.findProperty("enableStrictContext") ?: true}")
+  if (project.findProperty("disableShadowRelocate") != "true") {
+    jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=${rootProject.findProperty("enableStrictContext") ?: true}")
+  } else {
+    jvmArgs("-Dotel.instrumentation.opentelemetry-api.enabled=false")
+    jvmArgs("-Dotel.instrumentation.opentelemetry-instrumentation-api.enabled=false")
+  }
 
   // Disable default resource providers since they cause lots of output we don't need.
   jvmArgs("-Dotel.java.disabled.resource.providers=$resourceClassesCsv")

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

@@ -85,18 +85,20 @@ tasks.withType<ShadowJar>().configureEach {
   // rewrite dependencies calling Logger.getLogger
   relocate("java.util.logging.Logger", "io.opentelemetry.javaagent.bootstrap.PatchLogger")
 
-  // prevents conflict with library instrumentation, since these classes live in the bootstrap class loader
-  relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {
-    // Exclude resource providers since they live in the agent class loader
-    exclude("io.opentelemetry.instrumentation.resources.*")
-    exclude("io.opentelemetry.instrumentation.spring.resources.*")
-  }
+  if (project.findProperty("disableShadowRelocate") != "true") {
+    // prevents conflict with library instrumentation, since these classes live in the bootstrap class loader
+    relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {
+      // Exclude resource providers since they live in the agent class loader
+      exclude("io.opentelemetry.instrumentation.resources.*")
+      exclude("io.opentelemetry.instrumentation.spring.resources.*")
+    }
 
-  // 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.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
-  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(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.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
+    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)
   // these extensions live in the AgentClassLoader, and are injected into the user's class loader

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.tooling;
 
+import io.opentelemetry.context.Context;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -164,8 +165,14 @@ private static boolean isJar(File f) {
 
   private static void addFileUrl(List<URL> result, File file) {
     try {
-      URL wrappedUrl = new URL("otel", null, -1, "/", new RemappingUrlStreamHandler(file));
-      result.add(wrappedUrl);
+      // skip shading extension classes if opentelemetry-api is not shaded (happens when using
+      // disableShadowRelocate=true)
+      if (Context.class.getName().contains("shaded")) {
+        URL wrappedUrl = new URL("otel", null, -1, "/", new RemappingUrlStreamHandler(file));
+        result.add(wrappedUrl);
+      } else {
+        result.add(file.toURI().toURL());
+      }
     } catch (MalformedURLException ignored) {
       System.err.println("Ignoring " + file);
     }