Upgrade otel 1 10 (#357)

* ⬆️ upgrade otel

* ♻️ update servlet-common packaging

* ♻️ update HttpStatusConverter package location'

* ♻️ update TestOpenTelemetryInstaller to be an AgentListener

* ➕ add new deps to the testing bootstrap

* ➕ add logging exporter to classpath explicitly for tests

* ♻️ fix initialization in instrumentation tests

* ➕ add servlet-common bootstrap to test runtime for servlet projects

* ♻️ refactor MuzzlePlugin to handle refactor of MuzzleGradlePluginUtil to kotlin companion object'

* 🐛 fix muzzle check for instrumentation modules that need the servlet-common bootstrap

* ⬆️ upgrade byte buddy

* 🐛 fix expected metric name for otlp exporter exported'

* 🐛 disable assertions failing due to upstream bug

Author: ryandens

build.gradle.kts

@@ -34,12 +34,12 @@ subprojects {
     extra.set("versions", mapOf(
             // when updating these values, some values must also be updated in buildSrc as this map
             // cannot be accessed there
-            "opentelemetry" to "1.9.1",
+            "opentelemetry" to "1.10.0",
             "opentelemetry_proto" to "0.11.0-alpha",
-            "opentelemetry_java_agent" to "1.9.2-alpha",
-            "opentelemetry_java_agent_all" to "1.9.2",
-            "opentelemetry_gradle_plugin" to "1.9.2-alpha",
-            "byte_buddy" to "1.11.22",
+            "opentelemetry_java_agent" to "1.10.0-alpha",
+            "opentelemetry_java_agent_all" to "1.10.0",
+            "opentelemetry_gradle_plugin" to "1.10.0-alpha",
+            "byte_buddy" to "1.12.6",
                 "slf4j" to "1.7.30"
     ))
 

buildSrc/build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
-  val otelInstrumentationVersion = "1.9.2-alpha"
+  val otelInstrumentationVersion = "1.10.0-alpha"
   implementation("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:$otelInstrumentationVersion")
@@ -40,10 +40,10 @@ dependencies {
   implementation("org.ow2.asm", "asm", "9.1")
   implementation("org.ow2.asm", "asm-tree", "9.1")
   implementation("org.apache.httpcomponents:httpclient:4.5.10")
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.22") {
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.6") {
     exclude(group = "net.bytebuddy", module = "byte-buddy")
   }
-  implementation("net.bytebuddy:byte-buddy-dep:1.11.22")
+  implementation("net.bytebuddy:byte-buddy-dep:1.12.6")
 
   testImplementation("org.spockframework", "spock-core", "1.3-groovy-2.5")
   testImplementation("org.codehaus.groovy", "groovy-all", "2.5.8")

buildSrc/src/main/groovy/MuzzlePlugin.groovy

@@ -4,10 +4,12 @@
  */
 
 
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import io.opentelemetry.javaagent.muzzle.matcher.MuzzleGradlePluginUtil
 import org.gradle.api.file.FileCollection
+import org.gradle.api.file.RegularFile
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
-import java.lang.reflect.Method
-import java.security.SecureClassLoader
 import java.util.concurrent.atomic.AtomicReference
 import java.util.function.Predicate
 import java.util.regex.Pattern
@@ -72,6 +74,13 @@ class MuzzlePlugin implements Plugin<Project> {
     // compileMuzzle compiles all projects required to run muzzle validation.
     // Not adding group and description to keep this task from showing in `gradle tasks`.
     def compileMuzzle = project.task('compileMuzzle')
+    def muzzleBootstrap = project.configurations.create("muzzleBootstrap")
+    muzzleBootstrap.setCanBeConsumed(false)
+    muzzleBootstrap.setCanBeResolved(true)
+    def shadowMuzzleBootstrap = project.tasks.create("shadowMuzzleBootstrap", ShadowJar.class) {
+      configurations = [muzzleBootstrap]
+      archiveFileName.set("bootstrap-for-muzzle-check.jar")
+    }
     def muzzle = project.task('muzzle') {
       group = 'Muzzle'
       description = "Run instrumentation muzzle on compile time dependencies"
@@ -80,21 +89,18 @@ 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.muzzle.matcher.MuzzleGradlePluginUtil')
-            .getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
-          assertionMethod.invoke(null, instrumentationCL, userCL, true)
+          MuzzleGradlePluginUtil.@Companion.assertInstrumentationMuzzled(instrumentationCL, userCL, true)
         }
         println "Muzzle executing for $project"
       }
+      dependsOn(shadowMuzzleBootstrap)
     }
     def printReferences = project.task('printMuzzleReferences') {
       group = 'Muzzle'
       description = "Print references created by instrumentation muzzle"
       doLast {
         ClassLoader instrumentationCL = createInstrumentationClassloader(project, toolingProject)
-        Method assertionMethod = instrumentationCL.loadClass('io.opentelemetry.javaagent.muzzle.matcher.MuzzleGradlePluginUtil')
-          .getMethod('printMuzzleReferences', ClassLoader.class)
-        assertionMethod.invoke(null, instrumentationCL)
+        MuzzleGradlePluginUtil.@Companion.printMuzzleReferences(instrumentationCL)
       }
     }
     project.tasks.compileMuzzle.dependsOn(bootstrapProject.tasks.compileJava)
@@ -201,7 +207,7 @@ class MuzzlePlugin implements Plugin<Project> {
   /**
    * Create a classloader with dependencies for a single muzzle task.
    */
-  private static ClassLoader createClassLoaderForTask(Project project, Project bootstrapProject, String muzzleTaskName) {
+  private static ClassLoader createClassLoaderForTask(Project project, Project bootstrapProject, String muzzleTaskName, RegularFile shadowMuzzleArchiveFile) {
     List<URL> userUrls = new ArrayList<>()
 
     project.getLogger().info("Creating task classpath")
@@ -214,6 +220,9 @@ class MuzzlePlugin implements Plugin<Project> {
       project.getLogger().info("-- Added to instrumentation bootstrap classpath: $f")
       userUrls.add(f.toURI().toURL())
     }
+    if (shadowMuzzleArchiveFile != null) {
+      userUrls.add(shadowMuzzleArchiveFile.asFile.toURI().toURL())
+    }
     return new URLClassLoader(userUrls.toArray(new URL[0]), ClassLoader.platformClassLoader)
   }
 
@@ -377,12 +386,14 @@ class MuzzlePlugin implements Plugin<Project> {
         ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject)
         def ccl = Thread.currentThread().contextClassLoader
         Thread.currentThread().contextClassLoader = instrumentationCL
-        ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName)
+        def shadowMuzzleTask = project.tasks.findByName("shadowMuzzleBootstrap") as AbstractArchiveTask
+        RegularFile shadowMuzzleArchiveFile
+        if (shadowMuzzleTask != null) {
+          shadowMuzzleArchiveFile = shadowMuzzleTask.getArchiveFile().get()
+        }
+        ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName, shadowMuzzleArchiveFile)
         try {
-          // find all instrumenters, get muzzle, and assert
-          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)
+          MuzzleGradlePluginUtil.@Companion.assertInstrumentationMuzzled(instrumentationCL, userCL, muzzleDirective.assertPass)
         } finally {
           Thread.currentThread().contextClassLoader = ccl
         }

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientResponseTracingHandler.java

@@ -28,7 +28,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_0.client.NettyClientSingletons;

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerResponseTracingHandler.java

@@ -28,7 +28,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_0.server.NettyServerSingletons;

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java

@@ -28,7 +28,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyClientSingletons;

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerResponseTracingHandler.java

@@ -28,7 +28,7 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
+import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.NettyServerSingletons;

instrumentation/servlet/servlet-3.0/build.gradle.kts

@@ -30,12 +30,14 @@ afterEvaluate{
 val versions: Map<String, String> by extra
 
 dependencies {
-    implementation("io.opentelemetry.instrumentation:opentelemetry-servlet-common:${versions["opentelemetry_java_agent"]}")
+    implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}") // Servlet3Accessor
     testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
     testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
     compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
     compileOnly("javax.servlet:javax.servlet-api:3.1.0")
+    testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
+    muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
 
     testImplementation(project(":instrumentation:servlet:servlet-rw"))
     testImplementation(testFixtures(project(":testing-common")) as ProjectDependency) {

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/async/BodyCaptureAsyncListener.java

@@ -18,8 +18,8 @@
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.instrumentation.servlet.ServletAsyncListener;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.Utils;
+import io.opentelemetry.javaagent.instrumentation.servlet.ServletAsyncListener;
 import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons;
 import java.io.BufferedReader;
 import java.io.PrintWriter;

instrumentation/spark-2.3/build.gradle.kts

@@ -1,3 +1,4 @@
+
 plugins {
     `java-library`
     id("net.bytebuddy.byte-buddy")
@@ -30,6 +31,8 @@ dependencies {
     testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-spark-2.3:${versions["opentelemetry_java_agent"]}")
     testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
     testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jetty-8.0:${versions["opentelemetry_java_agent"]}")
+    testRuntimeOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
+    muzzleBootstrap("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("com.sparkjava:spark-core:2.3")