Upgrade to OTEL 1.7.X (#355)

* ⬆️ upgrade otel SDK

* 🚧

* 🐛 remove all classifier from javaagent artifact

* 🔥 delete tooling from autoinstrumentation dependency

* 🐛 add compile dependencies on relocated otel servlet objects

* ♻️ refactor java-streams to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ refactor apache-http to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ rename otel Cache.newBuilder() to builder()

* ♻️ refactor jaxrs-client to handle InstrumentationContext and ContextStore renaming to VirtualField

* 🎨 format java-streams

* 🎨 format apache-http

* 🎨 format jaxrs-client"

* ♻️ refactor servlet-3.0 to handle InstrumentationContext and ContextStore renaming to VirtualField

* 🐛 add otel to instrumentation classpath'

* 🐛 update netty-4.0 module based on otel refactor to the instrumenter API

* 🐛 update netty-4.1 module based on otel refactor to the instrumenter API

* ♻️ refactor servlet-rw to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ refactor undertow-1.4 to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ refactor undertow-servlet to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ refactor vertx to handle InstrumentationContext and ContextStore renaming to VirtualField

* ♻️ account for InstrumentationModule muzzle refactor in java-streams module

* ♻️ account for InstrumentationModule muzzle refactor in servlet-3.0

* ♻️ account for InstrumentationModule muzzle refactor in servlet-rw

* 🐛 upgrade gradle plugins, move tooling to convention plugin for ease of configuration

* ♻️ rename MuzzleCodeGenerationPlugin

* 🐛 add constraint for java9 tooling API

* 🐛 fix expected metric name for span exporter

* 🐛 fix class definition error as a result of using Span.fromContext inline

* ✅ update assertions based on the removal of http.url for http.scheme, http.host, and http.target

* 🔥 remove javaagent tooling dep in auto-instrumentation plugin

* ♻️ add gradle plugin version to map

* 🔥 remove unneeded deps from javaagent-tooling

* 💡 add comment clarifying java 9 constraint

* 🐛 add otel-muzzle as muzzle dep

Author: ryandens

build.gradle.kts

@@ -32,9 +32,12 @@ subprojects {
     description = "Hypertrace OpenTelemetry Javaagent"
 
     extra.set("versions", mapOf(
-            "opentelemetry" to "1.6.0",
-            "opentelemetry_java_agent" to "1.6.2-alpha",
-            "opentelemetry_java_agent_all" to "1.6.2",
+            // when updating these values, some values must also be updated in buildSrc as this map
+            // cannot be accessed there
+            "opentelemetry" to "1.7.1",
+            "opentelemetry_java_agent" to "1.7.2-alpha",
+            "opentelemetry_java_agent_all" to "1.7.2",
+            "opentelemetry_gradle_plugin" to "0.8.0",
             "byte_buddy" to "1.11.2",
                 "slf4j" to "1.7.30"
     ))

buildSrc/build.gradle.kts

@@ -27,9 +27,9 @@ repositories {
 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("io.opentelemetry.javaagent:opentelemetry-muzzle:1.7.2-alpha")
+  implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:0.8.0")
+  implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:0.8.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/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java

@@ -9,13 +9,11 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
-import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.attributes.LibraryElements;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.JavaPlugin;
@@ -62,9 +60,6 @@ private void addDependencies(Project project) {
     dependencies.add("implementation", "net.bytebuddy:byte-buddy:" + versions.get("byte_buddy"));
     dependencies.add("implementation",
         "io.opentelemetry:opentelemetry-api:" + versions.get("opentelemetry"));
-    dependencies.add("implementation",
-        "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:" + versions
-            .get("opentelemetry_java_agent"));
     dependencies.add("implementation",
         "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:" + versions
             .get("opentelemetry_java_agent"));

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.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
+        io.opentelemetry.javaagent.tooling.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.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
+            io.opentelemetry.javaagent.tooling.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientObjectRegistry.java

@@ -24,7 +24,7 @@
 public class ApacheHttpClientObjectRegistry {
 
   public static final Cache<HttpEntity, SpanAndAttributeKey> entityToSpan =
-      Cache.newBuilder().setWeakKeys().build();
+      Cache.builder().setWeakKeys().build();
 
   public static class SpanAndAttributeKey {
     public final Span span;

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/HttpEntityInstrumentation.java

@@ -23,10 +23,9 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
+import io.opentelemetry.instrumentation.api.field.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.api.ContextStore;
-import io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.apachehttpclient.v4_0.ApacheHttpClientObjectRegistry.SpanAndAttributeKey;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -99,8 +98,7 @@ public static void exit(@Advice.This HttpEntity thizz, @Advice.Return InputStrea
               BoundedBuffersFactory.createStream((int) contentSize, charset),
               clientSpan.attributeKey,
               charset);
-      InstrumentationContext.get(InputStream.class, SpanAndBuffer.class)
-          .put(inputStream, spanAndBuffer);
+      VirtualField.find(InputStream.class, SpanAndBuffer.class).set(inputStream, spanAndBuffer);
     }
   }
 
@@ -128,8 +126,8 @@ public static void enter(
       BoundedByteArrayOutputStream byteArrayOutputStream =
           BoundedBuffersFactory.createStream((int) contentSize, charset);
 
-      InstrumentationContext.get(OutputStream.class, BoundedByteArrayOutputStream.class)
-          .put(outputStream, byteArrayOutputStream);
+      VirtualField.find(OutputStream.class, BoundedByteArrayOutputStream.class)
+          .set(outputStream, byteArrayOutputStream);
     }
 
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
@@ -142,10 +140,10 @@ public static void exit(
         return;
       }
 
-      ContextStore<OutputStream, BoundedByteArrayOutputStream> contextStore =
-          InstrumentationContext.get(OutputStream.class, BoundedByteArrayOutputStream.class);
+      VirtualField<OutputStream, BoundedByteArrayOutputStream> contextStore =
+          VirtualField.find(OutputStream.class, BoundedByteArrayOutputStream.class);
       BoundedByteArrayOutputStream bufferedOutStream = contextStore.get(outputStream);
-      contextStore.put(outputStream, null);
+      contextStore.set(outputStream, null);
       try {
         String requestBody = bufferedOutStream.toStringWithSuppliedCharset();
         spanAndAttributeKey.span.setAttribute(spanAndAttributeKey.attributeKey, requestBody);

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.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
+            io.opentelemetry.javaagent.tooling.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.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
+            io.opentelemetry.javaagent.tooling.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }

instrumentation/java-streams/build.gradle.kts

@@ -14,11 +14,14 @@ muzzle {
 afterEvaluate{
     io.opentelemetry.instrumentation.gradle.bytebuddy.ByteBuddyPluginConfigurator(project,
             sourceSets.main.get(),
-            io.opentelemetry.javaagent.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
+            io.opentelemetry.javaagent.tooling.muzzle.generation.MuzzleCodeGenerationPlugin::class.java.name,
             project(":javaagent-tooling").configurations["instrumentationMuzzle"] + configurations.runtimeClasspath
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-     testImplementation(testFixtures(project(":testing-common")))
+    testImplementation(testFixtures(project(":testing-common")))
+    testImplementation("io.opentelemetry.javaagent:opentelemetry-muzzle:${versions["opentelemetry_java_agent"]}")
 }