Move instrumentationMuzzle configurations to javaagent-tooling (#49)

pavolloffay · web-flow · commit faf316d83799 · 2020-10-23T09:02:48.000+02:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/instrumentation/servlet/servlet-2.3/build.gradle.kts b/instrumentation/servlet/servlet-2.3/build.gradle.kts
@@ -23,13 +23,11 @@ afterEvaluate{
         transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
             setTasks(setOf("compileJava", "compileScala", "compileKotlin"))
             plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
-            setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
+            setClassPath(project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath + sourceSets["main"].output)
         })
     }
 }
 
-val instrumentationMuzzle by configurations.creating
-
 dependencies {
     api(project(":blocking"))
     api(project(":instrumentation:servlet:servlet-common"))
@@ -39,15 +37,6 @@ dependencies {
 
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:0.9.0")
 
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
-    instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
-    instrumentationMuzzle("com.google.auto.service:auto-service:1.0-rc7")
-    instrumentationMuzzle("org.slf4j:slf4j-api:1.7.30")
-
     testImplementation(project(":testing-common"))
     testImplementation("org.eclipse.jetty:jetty-server:7.5.4.v20111024")
     testImplementation("org.eclipse.jetty:jetty-servlet:7.5.4.v20111024")
diff --git a/instrumentation/servlet/servlet-3.0/build.gradle.kts b/instrumentation/servlet/servlet-3.0/build.gradle.kts
@@ -24,13 +24,11 @@ afterEvaluate{
         transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
             setTasks(kotlin.collections.setOf("compileJava", "compileScala", "compileKotlin"))
             plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
-            setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
+            setClassPath(project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath + sourceSets["main"].output)
         })
     }
 }
 
-val instrumentationMuzzle by configurations.creating
-
 dependencies {
     api(project(":blocking"))
     api(project(":instrumentation:servlet:servlet-common"))
@@ -40,15 +38,6 @@ dependencies {
 
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.9.0")
 
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
-    instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
-    instrumentationMuzzle("com.google.auto.service:auto-service:1.0-rc7")
-    instrumentationMuzzle("org.slf4j:slf4j-api:1.7.30")
-
     testImplementation(project(":testing-common"))
     testImplementation("org.eclipse.jetty:jetty-server:8.1.22.v20160922")
     testImplementation("org.eclipse.jetty:jetty-servlet:8.1.22.v20160922")
diff --git a/instrumentation/servlet/servlet-3.1/build.gradle.kts b/instrumentation/servlet/servlet-3.1/build.gradle.kts
@@ -25,13 +25,11 @@ afterEvaluate{
         transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
             setTasks(setOf("compileJava", "compileScala", "compileKotlin"))
             plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
-            setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output)
+            setClassPath(project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath + sourceSets["main"].output)
         })
     }
 }
 
-val instrumentationMuzzle by configurations.creating
-
 dependencies {
     api(project(":blocking"))
     api(project(":instrumentation:servlet:servlet-common"))
@@ -41,15 +39,6 @@ dependencies {
 
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.9.0")
 
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
-    instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
-    instrumentationMuzzle("com.google.auto.service:auto-service:1.0-rc7")
-    instrumentationMuzzle("org.slf4j:slf4j-api:1.7.30")
-
     testImplementation(project(":testing-common"))
     testImplementation("org.eclipse.jetty:jetty-server:9.4.32.v20200930")
     testImplementation("org.eclipse.jetty:jetty-servlet:9.4.32.v20200930")
diff --git a/instrumentation/spark-web-framework-2.3/build.gradle.kts b/instrumentation/spark-web-framework-2.3/build.gradle.kts
@@ -19,13 +19,11 @@ afterEvaluate{
         transformation(closureOf<net.bytebuddy.build.gradle.Transformation> {
             setTasks(kotlin.collections.setOf("compileJava", "compileScala", "compileKotlin"))
             plugin = "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin"
-            setClassPath(instrumentationMuzzle + configurations.runtimeClasspath + sourceSets["main"].output + project(":instrumentation:servlet:servlet-3.1").sourceSets["main"].output)
+            setClassPath(project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath + sourceSets["main"].output + project(":instrumentation:servlet:servlet-3.1").sourceSets["main"].output)
         })
     }
 }
 
-val instrumentationMuzzle by configurations.creating
-
 dependencies {
     api(project(":blocking"))
     api(project(":instrumentation:servlet:servlet-3.1"))
@@ -37,15 +35,6 @@ dependencies {
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.9.0")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jetty-8.0:0.9.0")
 
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
-    instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
-    instrumentationMuzzle("com.google.auto.service:auto-service:1.0-rc7")
-    instrumentationMuzzle("org.slf4j:slf4j-api:1.7.30")
-
     testImplementation(project(":testing-common"))
     testImplementation("com.sparkjava:spark-core:2.3")
 }
diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts
@@ -4,8 +4,17 @@ plugins {
     `java-library`
 }
 
-dependencies{
+val instrumentationMuzzle by configurations.creating {
+    extendsFrom(configurations.implementation.get())
+}
+
+dependencies {
     implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
     implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
+    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
+    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.10")
+    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.10")
+    instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
+    instrumentationMuzzle("com.google.auto.service:auto-service:1.0-rc7")
+    instrumentationMuzzle("org.slf4j:slf4j-api:1.7.30")
 }
-
