extract shadow jar for spring and javaagent separately

open-telemetry · May 3, 2024 · dad8cd5 · dad8cd5
1 parent 2ddaae5
commit dad8cd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts b/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts
@@ -30,6 +30,13 @@ tasks {
   val extractShadowJar by registering(Copy::class) {
     dependsOn(shadowJar)
     from(zipTree(shadowJar.get().archiveFile))
+    exclude("META-INF/**")
     into("build/extracted/shadow")
   }
+
+  val extractShadowJarSpring by registering(Copy::class) {
+    dependsOn(shadowJar)
+    from(zipTree(shadowJar.get().archiveFile))
+    into("build/extracted/shadow-spring")
+  }
 }
diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts
@@ -15,8 +15,8 @@ sourceSets {
   main {
     val shadedDep = project(":instrumentation:r2dbc-1.0:library-instrumentation-shaded")
     output.dir(
-      shadedDep.file("build/extracted/shadow"),
-      "builtBy" to ":instrumentation:r2dbc-1.0:library-instrumentation-shaded:extractShadowJar",
+      shadedDep.file("build/extracted/shadow-spring"),
+      "builtBy" to ":instrumentation:r2dbc-1.0:library-instrumentation-shaded:extractShadowJarSpring",
     )
   }
 }