fix build

Author: laurit

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

@@ -7,6 +7,8 @@ plugins {
 // NOTE: any modifications below should also be made in
 //       io.opentelemetry.instrumentation.muzzle-check.gradle.kts
 tasks.withType<ShadowJar>().configureEach {
+  // mergeServiceFiles requires that duplicate strategy is set to include
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
   // Merge any AWS SDK service files that may be present (too bad they didn't just use normal
   // service loader...)

examples/distro/agent/build.gradle

@@ -64,8 +64,6 @@ tasks {
   task relocateJavaagentLibs(type: ShadowJar) {
     configurations = [project.configurations.javaagentLibs]
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     archiveFileName.set("javaagentLibs-relocated.jar")
 
     mergeServiceFiles()
@@ -105,8 +103,6 @@ tasks {
 
     archiveClassifier.set("all")
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     mergeServiceFiles {
       include("inst/META-INF/services/*")
     }

examples/distro/gradle/instrumentation.gradle

@@ -35,6 +35,9 @@ dependencies {
 
 shadowJar {
   configurations = [project.configurations.runtimeClasspath, project.configurations.testInstrumentation]
+
+  // mergeServiceFiles requires that duplicate strategy is set to include
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
 
   archiveFileName = 'agent-testing.jar'

examples/distro/testing/agent-for-testing/build.gradle

@@ -59,10 +59,10 @@ tasks {
   task relocateJavaagentLibs(type: ShadowJar) {
     configurations = [project.configurations.javaagentLibs]
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     archiveFileName.set("javaagentLibs-relocated.jar")
 
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     mergeServiceFiles()
     exclude("**/module-info.class")
     relocatePackages(it)
@@ -100,7 +100,8 @@ tasks {
 
     archiveClassifier.set("")
 
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
     mergeServiceFiles {
       include("inst/META-INF/services/*")

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

@@ -74,6 +74,8 @@ val shadowMuzzleBootstrap by tasks.registering(ShadowJar::class) {
 // this is a copied from io.opentelemetry.instrumentation.javaagent-shadowing for now at least to
 // avoid publishing io.opentelemetry.instrumentation.javaagent-shadowing publicly
 tasks.withType<ShadowJar>().configureEach {
+  // mergeServiceFiles requires that duplicate strategy is set to include
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   mergeServiceFiles()
   // Merge any AWS SDK service files that may be present (too bad they didn't just use normal
   // service loader...)

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -227,6 +227,8 @@ tasks {
   }
 
   withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>().configureEach {
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     mergeServiceFiles {
       include("software/amazon/awssdk/global/handlers/execution.interceptors")
     }

javaagent-internal-logging-simple/build.gradle.kts

@@ -22,6 +22,8 @@ dependencies {
 
 tasks {
   val shadowJar by existing(ShadowJar::class) {
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     // required for META-INF/services files relocation
     mergeServiceFiles()
 

javaagent/build.gradle.kts

@@ -161,8 +161,6 @@ tasks {
 
     excludeBootstrapClasses()
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     archiveFileName.set("baseJavaagentLibs-relocated-tmp.jar")
   }
 
@@ -183,8 +181,6 @@ tasks {
     // remove MPL licensed content
     exclude("okhttp3/internal/publicsuffix/PublicSuffixDatabase.list")
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     archiveFileName.set("javaagentLibs-relocated-tmp.jar")
   }
 

testing/armeria-shaded-for-testing/build.gradle.kts

@@ -37,6 +37,8 @@ tasks {
     relocate("org.HdrHistogram", "io.opentelemetry.testing.internal.org.hdrhistogram")
     relocate("org.LatencyUtils", "io.opentelemetry.testing.internal.org.latencyutils")
 
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     mergeServiceFiles()
   }
 

testing/wiremock-shaded-for-testing/build.gradle.kts

@@ -35,6 +35,8 @@ tasks {
     relocate("javax.servlet", "io.opentelemetry.testing.internal.servlet")
     relocate("org.yaml", "io.opentelemetry.testing.internal.yaml")
 
+    // mergeServiceFiles requires that duplicate strategy is set to include
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     mergeServiceFiles()
   }