open-telemetry · trask · Mar 9, 2020 · Mar 3, 2020 · Mar 4, 2020 · Mar 5, 2020
diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
@@ -0,0 +1,54 @@
+// common gradle file for instrumentation
+
+apply plugin: 'net.bytebuddy.byte-buddy'
+apply plugin: 'muzzle'
+
+byteBuddy {
+  transformation {
+    // Applying NoOp optimizes build by applying bytebuddy plugin to only compileJava task
+    tasks = ['compileJava', 'compileScala', 'compileKotlin']
+    plugin = 'io.opentelemetry.auto.tooling.muzzle.MuzzleGradlePlugin$NoOp'
+  }
+}
+
+apply from: "${rootDir}/gradle/java.gradle"
+
+afterEvaluate {
+  byteBuddy {
+    transformation {
+      tasks = ['compileJava', 'compileScala', 'compileKotlin']
+      plugin = 'io.opentelemetry.auto.tooling.muzzle.MuzzleGradlePlugin'
+      classPath = project(':auto-tooling').configurations.instrumentationMuzzle + configurations.compile + sourceSets.main.output
+    }
+  }
+
+  String jdkCompile = null
+  if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_7) {
+    def version = JavaVersion.toVersion(project.getProperty('minJavaVersionForTests'))
+    def name = "java$version.majorVersion"
+    jdkCompile = "main_${name}Compile"
+  }
+  dependencies {
+    // Apply common dependencies for instrumentation.
+    compile(project(':auto-tooling')) {
+      // OpenTelemetry SDK is not needed for compilation, and :opentelemetry-sdk-shaded-for-testing
+      // is brought in for tests by project(:testing) below
+      exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
+    }
+    compile deps.bytebuddy
+    if (jdkCompile) {
+      "$jdkCompile"(project(':auto-tooling')) {
+        // OpenTelemetry SDK is not needed for compilation, and :opentelemetry-sdk-shaded-for-testing
+        // is brought in for tests by project(:testing) below
+        exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
+      }
+      "$jdkCompile" deps.bytebuddy
+    }
+    annotationProcessor deps.autoservice
+    implementation deps.autoservice
+
+    testCompile project(':testing')
+    testAnnotationProcessor deps.autoservice
+    testImplementation deps.autoservice
+  }
+}
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -225,7 +225,7 @@ if (project.hasProperty("removeJarVersionNumbers") && removeJarVersionNumbers) {
   }
 }
 
-if (project.parent && project.parent.hasProperty("javaExecutableVersionCache")) {
+if (project.parent && project.parent.ext.has("javaExecutableVersionCache")) {
   project.ext.javaExecutableVersionCache = project.parent.ext.javaExecutableVersionCache
 } else {
   project.ext.javaExecutableVersionCache = [:]

diff --git a/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/instrumentation/akka-http-10.0/akka-http-10.0.gradle
@@ -3,10 +3,10 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 apply from: "${rootDir}/gradle/test-with-scala.gradle"
-
 apply plugin: 'org.unbroken-dome.test-sets'
+
 testSets {
   lagomTest
 

diff --git a/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle b/instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
@@ -2,6 +2,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.apache.httpcomponents"
@@ -11,9 +14,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/apache-httpclient-3.0/apache-httpclient-3.0.gradle b/instrumentation/apache-httpclient-3.0/apache-httpclient-3.0.gradle
@@ -1,3 +1,6 @@
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "commons-httpclient"
@@ -7,9 +10,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/apache-httpclient-4.0/apache-httpclient-4.0.gradle b/instrumentation/apache-httpclient-4.0/apache-httpclient-4.0.gradle
@@ -1,3 +1,6 @@
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   fail {
     group = "commons-httpclient"
@@ -19,9 +22,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/aws-sdk-1.11/aws-sdk-1.11.gradle b/instrumentation/aws-sdk-1.11/aws-sdk-1.11.gradle
@@ -1,3 +1,6 @@
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 // compiling against 1.11.0, but instrumentation should work against 1.10.33 with varying effects,
 // depending on the version's implementation. (i.e. DeleteOptionGroup may have less handlerCounts than
 // expected in 1.11.84. Testing against 1.11.0 instead of 1.10.33 because the RequestHandler class
@@ -14,10 +17,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   // Features used in test_1_11_106 (builder) is available since 1.11.84, but
   // using 1.11.106 because of previous concerns with byte code differences

diff --git a/instrumentation/aws-sdk-2.2/aws-sdk-2.2.gradle b/instrumentation/aws-sdk-2.2/aws-sdk-2.2.gradle
@@ -2,6 +2,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "software.amazon.awssdk"
@@ -11,10 +14,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest
 }

diff --git a/instrumentation/cassandra-3.0/cassandra-3.0.gradle b/instrumentation/cassandra-3.0/cassandra-3.0.gradle
@@ -6,6 +6,8 @@ ext {
   cassandraDriverTestVersions = "[3.0,4.0)"
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
 
 muzzle {
 
@@ -35,10 +37,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-testing/cdi-testing.gradle
@@ -1,5 +1,4 @@
-apply from: "${rootDir}/gradle/java.gradle"
-
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {

diff --git a/instrumentation/couchbase-2.0/couchbase-2.0.gradle b/instrumentation/couchbase-2.0/couchbase-2.0.gradle
@@ -3,8 +3,7 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {

diff --git a/instrumentation/couchbase-2.6/couchbase-2.6.gradle b/instrumentation/couchbase-2.6/couchbase-2.6.gradle
@@ -3,8 +3,7 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {

diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle
@@ -1,4 +1,4 @@
-apply from: "${rootDir}/gradle/java.gradle"
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 
 //apply plugin: 'org.unbroken-dome.test-sets'
 //

diff --git a/instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle b/instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle
@@ -1,3 +1,5 @@
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+
 muzzle {
   pass {
     group = 'io.dropwizard'
@@ -6,8 +8,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
 dependencies {
   compileOnly group: 'io.dropwizard', name: 'dropwizard-views', version: '0.7.0'
 

diff --git a/instrumentation/elasticsearch/elasticsearch.gradle b/instrumentation/elasticsearch/elasticsearch.gradle
@@ -1,4 +1,4 @@
-apply from: "${rootDir}/gradle/java.gradle"
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'

diff --git a/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle b/instrumentation/elasticsearch/rest-5.0/rest-5.0.gradle
@@ -3,6 +3,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -18,10 +21,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest
 }

diff --git a/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle b/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle
@@ -3,6 +3,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -19,10 +22,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest
 }

diff --git a/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle b/instrumentation/elasticsearch/transport-2.0/transport-2.0.gradle
@@ -4,6 +4,9 @@ ext {
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.elasticsearch"
@@ -13,10 +16,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest
 }

diff --git a/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle b/instrumentation/elasticsearch/transport-5.0/transport-5.0.gradle
@@ -3,6 +3,8 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -19,8 +21,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 

diff --git a/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle b/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
@@ -3,6 +3,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -19,10 +22,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle b/instrumentation/elasticsearch/transport-6.0/transport-6.0.gradle
@@ -3,6 +3,9 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -19,10 +22,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'

diff --git a/instrumentation/finatra-2.9/finatra-2.9.gradle b/instrumentation/finatra-2.9/finatra-2.9.gradle
@@ -3,9 +3,8 @@ ext {
   minJavaVersionForTests = JavaVersion.VERSION_1_8
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
+apply from: "${rootDir}/gradle/instrumentation.gradle"
 apply from: "${rootDir}/gradle/test-with-scala.gradle"
-
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {

diff --git a/instrumentation/google-http-client-1.19/google-http-client-1.19.gradle b/instrumentation/google-http-client-1.19/google-http-client-1.19.gradle
@@ -1,3 +1,6 @@
+apply from: "${rootDir}/gradle/instrumentation.gradle"
+apply plugin: 'org.unbroken-dome.test-sets'
+
 muzzle {
   pass {
     group = "com.google.http-client"
@@ -8,9 +11,6 @@ muzzle {
   }
 }
 
-apply from: "${rootDir}/gradle/java.gradle"
-apply plugin: 'org.unbroken-dome.test-sets'
-
 testSets {
   latestDepTest {
     dirName = 'test'