Upgrade otel 1 9 (#356)

* ⬆️ upgrade to otel 1.9

* ♻️ fix cache usage
'

* ♻️ update netty modules for moved APIs

* ⬆️ upgrade byte buddy

* 🔥 remove usage of struts2 convention plugin

Author: ryandens

Diff for: build.gradle.kts

@@ -34,11 +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.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",
+            "opentelemetry" to "1.9.1",
+            "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",
                 "slf4j" to "1.7.30"
     ))
 

Diff for: buildSrc/build.gradle.kts

@@ -27,19 +27,23 @@ repositories {
 dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
-  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")
+  val otelInstrumentationVersion = "1.9.2-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")
   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")
   implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
 
   implementation("com.google.guava", "guava", "20.0")
-  implementation("org.ow2.asm", "asm", "7.0-beta")
-  implementation("org.ow2.asm", "asm-tree", "7.0-beta")
+  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.2")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.22") {
+    exclude(group = "net.bytebuddy", module = "byte-buddy")
+  }
+  implementation("net.bytebuddy:byte-buddy-dep:1.11.22")
 
   testImplementation("org.spockframework", "spock-core", "1.3-groovy-2.5")
   testImplementation("org.codehaus.groovy", "groovy-all", "2.5.8")

Diff for: buildSrc/src/main/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java

@@ -57,7 +57,7 @@ private void addDependencies(Project project) {
     dependencies.add("implementation", "org.slf4j:slf4j-api:1.7.30");
     dependencies.add("compileOnly", "com.google.auto.service:auto-service-annotations:1.0");
     dependencies.add("annotationProcessor", "com.google.auto.service:auto-service:1.0");
-    dependencies.add("implementation", "net.bytebuddy:byte-buddy:" + versions.get("byte_buddy"));
+    dependencies.add("implementation", "net.bytebuddy:byte-buddy-dep:" + versions.get("byte_buddy"));
     dependencies.add("implementation",
         "io.opentelemetry:opentelemetry-api:" + versions.get("opentelemetry"));
     dependencies.add("implementation",

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

@@ -18,13 +18,12 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.instrumentation.api.caching.Cache;
+import io.opentelemetry.instrumentation.api.cache.Cache;
 import org.apache.http.HttpEntity;
 
 public class ApacheHttpClientObjectRegistry {
 
-  public static final Cache<HttpEntity, SpanAndAttributeKey> entityToSpan =
-      Cache.builder().setWeakKeys().build();
+  public static final Cache<HttpEntity, SpanAndAttributeKey> entityToSpan = Cache.weak();
 
   public static class SpanAndAttributeKey {
     public final Span span;

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

@@ -31,7 +31,7 @@
 import io.opentelemetry.instrumentation.api.tracer.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.NettyHttpClientTracer;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_0.client.NettyClientSingletons;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.nio.charset.Charset;
 import java.util.Map;
@@ -95,13 +95,14 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     try (Scope ignored = context.makeCurrent()) {
       ctx.fireChannelRead(msg);
     } catch (Throwable throwable) {
-      NettyHttpClientTracer.tracer().endExceptionally(context, throwable);
+      NettyClientSingletons.instrumenter().end(context, null, null, throwable);
       throw throwable;
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
+      span.setStatus(
+          HttpStatusConverter.CLIENT.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
     if (msg instanceof LastHttpContent) {
       span.end();

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

@@ -100,7 +100,8 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
+      span.setStatus(
+          HttpStatusConverter.SERVER.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
     if (msg instanceof LastHttpContent) {
       span.end();

Diff for: instrumentation/netty/netty-4.1/build.gradle.kts

@@ -42,8 +42,8 @@ afterEvaluate{
 val versions: Map<String, String> by extra
 
 dependencies {
-    implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4.1:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
+    implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1-common:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.1:${versions["opentelemetry_java_agent"]}")
     library("io.netty:netty-codec-http:4.1.0.Final")
 

Diff for: instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java

@@ -51,7 +51,8 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
+            .attr(
+                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
             .get();
     if (context == null) {
       ctx.write(msg, prm);

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

@@ -31,7 +31,7 @@
 import io.opentelemetry.instrumentation.api.tracer.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.NettyHttpClientTracer;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyClientSingletons;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.nio.charset.Charset;
 import java.util.Map;
@@ -53,7 +53,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
+            .attr(
+                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
             .get();
     if (context == null) {
       ctx.fireChannelRead(msg);
@@ -94,13 +95,14 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     try (Scope ignored = context.makeCurrent()) {
       ctx.fireChannelRead(msg);
     } catch (Throwable throwable) {
-      NettyHttpClientTracer.tracer().endExceptionally(context, throwable);
+      NettyClientSingletons.instrumenter().end(context, null, null, throwable);
       throw throwable;
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
+      span.setStatus(
+          HttpStatusConverter.CLIENT.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
     if (msg instanceof LastHttpContent) {
       span.end();

Diff for: instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerBlockingRequestHandler.java

@@ -38,7 +38,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
+            .attr(
+                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
             .get();
     if (context == null) {
       ctx.fireChannelRead(msg);

Diff for: instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerRequestTracingHandler.java

@@ -50,7 +50,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
+            .attr(
+                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
             .get();
     if (context == null) {
       ctx.fireChannelRead(msg);

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

@@ -52,7 +52,8 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap
   public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     Context context =
         ctx.channel()
-            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
+            .attr(
+                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.SERVER_CONTEXT)
             .get();
     if (context == null) {
       ctx.write(msg, prm);
@@ -99,7 +100,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.status().code());
-      span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.status().code()));
+      span.setStatus(HttpStatusConverter.SERVER.statusFromHttpStatus(httpResponse.status().code()));
     }
     if (msg instanceof LastHttpContent) {
       span.end();

Diff for: instrumentation/struts-2.3/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.internal.Cast.uncheckedCast
-
 plugins {
     `java-library`
     id("io.opentelemetry.instrumentation.auto-instrumentation")
@@ -16,7 +14,6 @@ dependencies {
     testImplementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
     testImplementation("org.apache.struts:struts2-core:2.3.1")
     testImplementation("org.apache.struts:struts2-json-plugin:2.3.1")
-    testImplementation("org.apache.struts:struts2-convention-plugin:2.3.1")
     testImplementation("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
     testImplementation("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
     testImplementation("javax.servlet:javax.servlet-api:3.0.1")

Diff for: instrumentation/struts-2.3/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/struts/Struts2Action.java

@@ -17,11 +17,7 @@
 package io.opentelemetry.javaagent.instrumentation.hypertrace.struts;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Result;
 
-@Result(type = "json")
-@ParentPackage("json-default")
 public class Struts2Action extends ActionSupport {
 
   private String jsonString = "{'balance':1000.21,'is_vip':true,'num':100,'name':'foo'}";

Diff for: javaagent-tooling/build.gradle.kts

@@ -21,8 +21,7 @@ dependencies {
     instrumentationMuzzle("io.opentelemetry.instrumentation:gradle-plugins:${versions["opentelemetry_gradle_plugin"]}")
     instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
     instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions["opentelemetry_java_agent"]}")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy:1.11.2")
-    instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.11.2")
+    instrumentationMuzzle("net.bytebuddy:byte-buddy-dep:1.11.22")
     instrumentationMuzzle("com.google.auto.service:auto-service:1.0")
     instrumentationMuzzle("org.slf4j:slf4j-api:${versions["slf4j"]}")
 }

Diff for: otel-extensions/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
 
     implementation("org.slf4j:slf4j-api:${versions["slf4j"]}")
     compileOnly("com.google.auto.service:auto-service-annotations:1.0")
-    implementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}")
+    implementation("net.bytebuddy:byte-buddy-dep:${versions["byte_buddy"]}")
     annotationProcessor("com.google.auto.service:auto-service:1.0")
 
 

Diff for: smoke-tests/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies{
     testImplementation("org.testcontainers:testcontainers:1.15.2")
     testImplementation("com.squareup.okhttp3:okhttp:4.9.0")
     testImplementation("org.awaitility:awaitility:4.0.3")
-    testImplementation("io.opentelemetry:opentelemetry-proto:${versions["opentelemetry"]}-alpha")
+    testImplementation("io.opentelemetry.proto:opentelemetry-proto:${versions["opentelemetry_proto"]}")
     testImplementation("io.grpc:grpc-core:1.36.1") // needed at runtime to send gRPC requests to the gRPC app
     testRuntimeOnly("io.grpc:grpc-netty-shaded:1.36.1") // needed at runtime to send gRPC requests to the gRPC app
     testRuntimeOnly("io.grpc:grpc-stub:1.36.1") // needed at runtime to send gRPC requests to the gRPC app