Merge branch 'kafka-connect-metadata' of github.com:jaydeluca/opentelemetry-java-instrumentation into kafka-connect-metadata

jaydeluca · jaydeluca · commit 4f48138a7e11 · 2025-10-18T09:04:41.000-04:00
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -2,7 +2,7 @@ test native:
 - all:
   - changed-files:
       - any-glob-to-any-file:
-          - instrumentation/logback/logback-appender-10/library/**
+          - instrumentation/logback/logback-appender-1.0/library/**
           - instrumentation/jdbc/library/**
           - instrumentation/spring/**
           - smoke-tests-otel-starter/**
diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))
 
-  testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.0"))
-  testImplementation("org.testcontainers:testcontainers:2.0.0")
+  testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.1"))
+  testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -32,7 +32,7 @@ val DEPENDENCY_BOMS = listOf(
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:2.0.0"
+  "org.testcontainers:testcontainers-bom:2.0.1"
 )
 
 val autoServiceVersion = "1.1.1"
diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:2.0.0")
+  testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -98,7 +98,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.19.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:2.0.0")
+  testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
diff --git a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java
@@ -14,6 +14,8 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.concurrent.CompletableFuture;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
+import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.reactivestreams.Subscriber;
@@ -52,20 +54,21 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WrapSubscriberAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(1))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapSubscriber(
-        @Advice.Argument(value = 1, readOnly = false) Subscriber<?> subscriber) {
-      subscriber = SubscriberWrapper.wrap(subscriber);
+    public static Subscriber<?> wrapSubscriber(@Advice.Argument(1) Subscriber<?> subscriber) {
+      return SubscriberWrapper.wrap(subscriber);
     }
   }
 
   @SuppressWarnings("unused")
   public static class WrapCompletableFutureAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(4))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapCompletableFuture(
-        @Advice.Argument(value = 4, readOnly = false) CompletableFuture<?> future) {
-      future = CompletableFutureWrapper.wrap(future);
+    public static CompletableFuture<?> wrapCompletableFuture(
+        @Advice.Argument(4) CompletableFuture<?> future) {
+      return CompletableFutureWrapper.wrap(future);
     }
   }
 }
diff --git a/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java b/instrumentation/armeria/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java
@@ -11,11 +11,13 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class ArmeriaInstrumentationModule extends InstrumentationModule {
+public class ArmeriaInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public ArmeriaInstrumentationModule() {
     super("armeria", "armeria-1.3");
   }
@@ -33,4 +35,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new ArmeriaServerBuilderInstrumentation(),
         new AbstractStreamMessageSubscriptionInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java b/instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/DropwizardMetricsInstrumentationModule.java
@@ -12,12 +12,14 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class DropwizardMetricsInstrumentationModule extends InstrumentationModule {
+public class DropwizardMetricsInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public DropwizardMetricsInstrumentationModule() {
     super("dropwizard-metrics", "dropwizard-metrics-4.0");
@@ -46,4 +48,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new MeterInstrumentation(),
         new TimerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java
@@ -10,10 +10,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class DropwizardInstrumentationModule extends InstrumentationModule {
+public class DropwizardInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
   public DropwizardInstrumentationModule() {
     super("dropwizard-views", "dropwizard-views-0.7");
   }
@@ -22,4 +24,9 @@ public DropwizardInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new DropwizardRendererInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardRendererInstrumentation.java
@@ -14,11 +14,12 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.dropwizard.views.View;
+import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -47,37 +48,50 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class RenderAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) View view,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(Context context, Scope scope) {
+        this.context = context;
+        this.scope = scope;
+      }
 
-      Context parentContext = Java8BytecodeBridge.currentContext();
+      @Nullable
+      public static AdviceScope start(View view) {
+        Context parentContext = Context.current();
 
-      // don't start a new top-level span
-      if (!Java8BytecodeBridge.spanFromContext(parentContext).getSpanContext().isValid()) {
-        return;
+        // don't start a new top-level span
+        if (!Span.fromContext(parentContext).getSpanContext().isValid()) {
+          return null;
+        }
+        if (!instrumenter().shouldStart(parentContext, view)) {
+          return null;
+        }
+
+        Context context = instrumenter().start(parentContext, view);
+        return new AdviceScope(context, context.makeCurrent());
       }
-      if (!instrumenter().shouldStart(parentContext, view)) {
-        return;
+
+      public void end(View view, @Nullable Throwable throwable) {
+        scope.close();
+        instrumenter().end(context, view, null, throwable);
       }
+    }
 
-      context = instrumenter().start(parentContext, view);
-      scope = context.makeCurrent();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(@Advice.Argument(0) View view) {
+      return AdviceScope.start(view);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Argument(0) View view,
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end(view, throwable);
       }
-      scope.close();
-      instrumenter().end(context, view, null, throwable);
     }
   }
 }
diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java
@@ -40,10 +40,15 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
 class ElasticsearchClientTest {
+  private static final Logger logger = LoggerFactory.getLogger(ElasticsearchClientTest.class);
+
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
@@ -57,9 +62,10 @@ class ElasticsearchClientTest {
   @BeforeAll
   static void setUp() {
     elasticsearch =
-        new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.2");
+        new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.28");
     // limit memory usage
     elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m");
+    elasticsearch.withLogConsumer(new Slf4jLogConsumer(logger));
     elasticsearch.start();
 
     httpHost = HttpHost.create(elasticsearch.getHttpHostAddress());
@@ -87,7 +93,7 @@ static void cleanUp() {
   @Test
   void elasticsearchStatus() throws IOException {
     InfoResponse response = client.info();
-    assertThat(response.version().number()).isEqualTo("7.17.2");
+    assertThat(response.version().number()).isEqualTo("7.17.28");
 
     testing.waitAndAssertTraces(
         trace ->
@@ -188,7 +194,7 @@ void elasticsearchStatusAsync() throws Exception {
     //noinspection ResultOfMethodCallIgnored
     countDownLatch.await(10, TimeUnit.SECONDS);
 
-    assertThat(request.getResponse().version().number()).isEqualTo("7.17.2");
+    assertThat(request.getResponse().version().number()).isEqualTo("7.17.28");
 
     testing.waitAndAssertTraces(
         trace ->
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java
@@ -61,7 +61,9 @@ static void setup() {
           new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16");
     }
     // limit memory usage
-    elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m");
+    elasticsearch.withEnv(
+        "ES_JAVA_OPTS",
+        "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport");
     elasticsearch.start();
 
     httpHost = HttpHost.create(elasticsearch.getHttpHostAddress());
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java
@@ -52,7 +52,9 @@ static void setUp() {
     elasticsearch =
         new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16");
     // limit memory usage
-    elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m");
+    elasticsearch.withEnv(
+        "ES_JAVA_OPTS",
+        "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport");
     elasticsearch.start();
 
     httpHost = HttpHost.create(elasticsearch.getHttpHostAddress());
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
@@ -55,7 +55,9 @@ static void setUp() {
     elasticsearch =
         new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2");
     // limit memory usage
-    elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m");
+    elasticsearch.withEnv(
+        "ES_JAVA_OPTS",
+        "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport");
     elasticsearch.start();
 
     httpHost = HttpHost.create(elasticsearch.getHttpHostAddress());
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java
@@ -51,7 +51,9 @@ static void setUp() {
     elasticsearch =
         new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2");
     // limit memory usage
-    elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m");
+    elasticsearch.withEnv(
+        "ES_JAVA_OPTS",
+        "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport");
     elasticsearch.start();
 
     httpHost = HttpHost.create(elasticsearch.getHttpHostAddress());
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/ApiClientInstrumentation.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/ApiClientInstrumentation.java
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java
diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java b/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java
diff --git a/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java
diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ val DEPENDENCY_BOMS = listOf(`
`32`	`32`	`"org.apache.groovy:groovy-bom:${groovyVersion}",`
`33`	`33`	`"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",`
`34`	`34`	`"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",`
`35`		`- "org.testcontainers:testcontainers-bom:2.0.0"`
	`35`	`+ "org.testcontainers:testcontainers-bom:2.0.1"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`val autoServiceVersion = "1.1.1"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- testImplementation("org.testcontainers:testcontainers:2.0.0")`
	`6`	`+ testImplementation("org.testcontainers:testcontainers:2.0.1")`
`7`	`7`	`testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")`
`8`	`8`	`testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")`
`9`	`9`	`testImplementation("com.squareup.okhttp3:okhttp:5.2.1")`