Upgrade otel 1 5 3 (#346)

* ⬆️ upgrade otel

* 🐛 fix buildSrc for instantiation of muzzle

* 🐛 fix muzzle codegen class name

* 🐛 add missing netty dependencies

* ➕ add missing vertx dependency

* 💩 🚧 WIP, try to make MuzzleGradlePluginUtil available

* 🐛 use instrumentation CL for muzzle

* ♻️ remove constrants as they are not needed in 0.7.0

* ➕ add muzzle-check gradle plugin to tooling project

* ⬆️ upgrade otel instrumentation version

* ♻️ depend on gradle-plugins rather than muzzle-check plugin

Author: ryandens

build.gradle.kts

@@ -32,9 +32,9 @@ subprojects {
     description = "Hypertrace OpenTelemetry Javaagent"
 
     extra.set("versions", mapOf(
-            "opentelemetry" to "1.4.1",
-            "opentelemetry_java_agent" to "1.4.1-alpha",
-            "opentelemetry_java_agent_all" to "1.4.1",
+            "opentelemetry" to "1.5.0",
+            "opentelemetry_java_agent" to "1.5.3-alpha",
+            "opentelemetry_java_agent_all" to "1.5.3",
             "byte_buddy" to "1.11.2",
                 "slf4j" to "1.7.30"
     ))

buildSrc/build.gradle.kts

@@ -28,6 +28,8 @@ dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
 
+  implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:0.7.0")
+  implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:0.7.0")
   implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0")
   implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")

buildSrc/src/main/groovy/MuzzlePlugin.groovy

@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
+import org.gradle.api.file.FileCollection
+
 import java.lang.reflect.Method
 import java.security.SecureClassLoader
 import java.util.concurrent.atomic.AtomicReference
@@ -31,6 +34,8 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.model.ObjectFactory
 
+import java.util.stream.StreamSupport
+
 /**
  * muzzle task plugin which runs muzzle validation against a range of dependencies.
  */
@@ -75,7 +80,7 @@ class MuzzlePlugin implements Plugin<Project> {
           project.getLogger().info('No muzzle pass directives configured. Asserting pass against instrumentation compile-time dependencies')
           ClassLoader userCL = createCompileDepsClassLoader(project, bootstrapProject)
           ClassLoader instrumentationCL = createInstrumentationClassloader(project, toolingProject)
-          Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
+          Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.muzzle.matcher.MuzzleGradlePluginUtil')
             .getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
           assertionMethod.invoke(null, instrumentationCL, userCL, true)
         }
@@ -87,7 +92,7 @@ class MuzzlePlugin implements Plugin<Project> {
       description = "Print references created by instrumentation muzzle"
       doLast {
         ClassLoader instrumentationCL = createInstrumentationClassloader(project, toolingProject)
-        Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
+        Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.muzzle.matcher.MuzzleGradlePluginUtil')
           .getMethod('printMuzzleReferences', ClassLoader.class)
         assertionMethod.invoke(null, instrumentationCL)
       }
@@ -167,7 +172,8 @@ class MuzzlePlugin implements Plugin<Project> {
   private static ClassLoader createInstrumentationClassloader(Project project, Project toolingProject) {
     project.getLogger().info("Creating instrumentation classpath for: " + project.getName())
     Set<URL> urls = new HashSet<>()
-    for (File f : project.sourceSets.main.runtimeClasspath.getFiles()) {
+    FileCollection classpath = project.sourceSets.main.runtimeClasspath + toolingProject.configurations.named("instrumentationMuzzle").get()
+    StreamSupport.stream(classpath.spliterator(), false).forEach { f ->
       project.getLogger().info('--' + f)
       urls.add(f.toURI().toURL())
     }
@@ -370,26 +376,19 @@ class MuzzlePlugin implements Plugin<Project> {
       doLast {
         ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject)
         def ccl = Thread.currentThread().contextClassLoader
-        def bogusLoader = new SecureClassLoader() {
-          @Override
-          String toString() {
-            return "bogus"
-          }
-
-        }
-        Thread.currentThread().contextClassLoader = bogusLoader
+        Thread.currentThread().contextClassLoader = instrumentationCL
         ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName)
         try {
           // find all instrumenters, get muzzle, and assert
-          Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.tooling.muzzle.matcher.MuzzleGradlePluginUtil')
+          Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.muzzle.matcher.MuzzleGradlePluginUtil')
             .getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
           assertionMethod.invoke(null, instrumentationCL, userCL, muzzleDirective.assertPass)
         } finally {
           Thread.currentThread().contextClassLoader = ccl
         }
 
         for (Thread thread : Thread.getThreads()) {
-          if (thread.contextClassLoader == bogusLoader || thread.contextClassLoader == instrumentationCL || thread.contextClassLoader == userCL) {
+          if (thread.contextClassLoader == instrumentationCL || thread.contextClassLoader == userCL) {
             throw new GradleException("Task $taskName has spawned a thread: $thread with classloader $thread.contextClassLoader. This will prevent GC of dynamic muzzle classes. Aborting muzzle run.")
           }
         }

buildSrc/src/main/java/io/opentelemetry/instrumentation/gradle/bytebuddy/ClasspathByteBuddyPlugin.java

@@ -60,15 +60,15 @@ public boolean matches(TypeDescription typeDefinitions) {
   private static Plugin pluginFromClassPath(
       Iterable<File> classPath, File sourceDirectory, String className) {
     try {
-      ClassLoader classLoader = classLoaderFromClassPath(classPath, sourceDirectory);
+      URLClassLoader classLoader = classLoaderFromClassPath(classPath, sourceDirectory);
       Class<?> clazz = Class.forName(className, false, classLoader);
-      return (Plugin) clazz.getDeclaredConstructor().newInstance();
+      return (Plugin) clazz.getDeclaredConstructor(URLClassLoader.class).newInstance(classLoader);
     } catch (Exception e) {
       throw new RuntimeException("Failed to create ByteBuddy plugin instance", e);
     }
   }
 
-  private static ClassLoader classLoaderFromClassPath(
+  private static URLClassLoader classLoaderFromClassPath(
       Iterable<File> classPath, File sourceDirectory) {
     List<URL> urls = new ArrayList<>();
     urls.add(fileAsUrl(sourceDirectory));

instrumentation/apache-httpasyncclient-4.1/build.gradle.kts

@@ -19,7 +19,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/apache-httpclient-4.0/build.gradle.kts

@@ -31,7 +31,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/grpc-1.6/build.gradle.kts

@@ -23,7 +23,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
     project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/grpc-shaded-netty-1.9/build.gradle.kts

@@ -17,7 +17,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/java-streams/build.gradle.kts

@@ -14,7 +14,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/jaxrs-client-2.0/build.gradle.kts

@@ -24,7 +24,7 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            "io.opentelemetry.javaagent.tooling.muzzle.collector.MuzzleCodeGenerationPlugin",
+            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }