hopefully fix shading

Author: laurit

instrumentation/internal/internal-class-loader/javaagent-integration-tests/build.gradle.kts

@@ -6,5 +6,5 @@ dependencies {
   compileOnly("org.apache.commons:commons-lang3:3.12.0")
   testImplementation("org.apache.commons:commons-lang3:3.12.0")
 
-  testInstrumentation(project(":instrumentation:internal:internal-class-loader:javaagent", configuration = "shadow"))
+  testInstrumentation(project(":instrumentation:internal:internal-class-loader:javaagent", configuration = "shaded"))
 }

instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id("otel.javaagent-instrumentation")
 }
@@ -23,8 +25,31 @@ dependencies {
   testImplementation("org.apache.felix:org.apache.felix.framework:6.0.2")
 }
 
+val shadedJar by tasks.registering(ShadowJar::class) {
+  from(zipTree(tasks.jar.get().archiveFile))
+  archiveClassifier.set("shaded")
+}
+
 tasks {
-  shadowJar {
+  withType(ShadowJar::class) {
     relocate("io.opentelemetry.javaagent.instrumentation.internal.classloader.stub", "java.lang")
   }
+
+  assemble {
+    dependsOn(shadedJar)
+  }
+}
+
+// Create a consumable configuration for the shaded jar. We can't use the "shadow" configuration
+// because that is taken by the agent-testing.jar
+configurations {
+  consumable("shaded") {
+    attributes {
+      attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("shaded"))
+    }
+  }
+}
+
+artifacts {
+  add("shaded", shadedJar)
 }

javaagent/build.gradle.kts

@@ -94,7 +94,7 @@ dependencies {
   baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent"))
   baseJavaagentLibs(project(":instrumentation:executors:javaagent"))
   baseJavaagentLibs(project(":instrumentation:internal:internal-application-logger:javaagent"))
-  baseJavaagentLibs(project(":instrumentation:internal:internal-class-loader:javaagent", configuration = "shadow"))
+  baseJavaagentLibs(project(":instrumentation:internal:internal-class-loader:javaagent", configuration = "shaded"))
   baseJavaagentLibs(project(":instrumentation:internal:internal-eclipse-osgi-3.6:javaagent"))
   baseJavaagentLibs(project(":instrumentation:internal:internal-lambda:javaagent"))
   baseJavaagentLibs(project(":instrumentation:internal:internal-reflection:javaagent"))
@@ -126,7 +126,11 @@ project(":instrumentation").subprojects {
 
   plugins.withId("otel.javaagent-instrumentation") {
     javaagentDependencies.run {
-      add(javaagentLibs.name, project(subProj.path))
+      // exclude :instrumentation:internal:internal-class-loader:javaagent we added the shaded
+      // configuration from it to baseJavaagentLibs
+      if (!subProj.path.contains("internal-class-loader")) {
+        add(javaagentLibs.name, project(subProj.path))
+      }
     }
   }