Merge branch 'main' into kotlin-ktor

Author: jaydeluca

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.14.1"))
 
-  testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.1"))
-  testImplementation("org.testcontainers:testcontainers:2.0.1")
+  testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.2"))
+  testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")

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.1"
+  "org.testcontainers:testcontainers-bom:2.0.2"
 )
 
 val autoServiceVersion = "1.1.1"

examples/distro/smoke-tests/build.gradle

@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:2.0.1")
+  testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -98,9 +98,9 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.19.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:2.0.1")
+  testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")

instrumentation/spring/spring-core-2.0/javaagent/src/test/java/SimpleAsyncTaskExecutorInstrumentationTest.java

@@ -3,11 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import org.junit.jupiter.api.Test;
@@ -22,6 +25,23 @@ class SimpleAsyncTaskExecutorInstrumentationTest {
 
   private static final SimpleAsyncTaskExecutor EXECUTOR = new SimpleAsyncTaskExecutor();
 
+  private static final Method submitListenableRunnable;
+  private static final Method submitListenableCallable;
+
+  static {
+    // removed in spring 7
+    submitListenableRunnable = findMethod("submitListenable", Runnable.class);
+    submitListenableCallable = findMethod("submitListenable", Callable.class);
+  }
+
+  private static Method findMethod(String name, Class<?>... parameterTypes) {
+    try {
+      return SimpleAsyncTaskExecutor.class.getMethod(name, parameterTypes);
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
   @Test
   void executeRunnable() {
     executeTwoTasks(EXECUTOR::execute);
@@ -39,12 +59,14 @@ void submitCallable() {
 
   @Test
   void submitListenableRunnable() {
-    executeTwoTasks(task -> EXECUTOR.submitListenable((Runnable) task));
+    assumeTrue(submitListenableRunnable != null);
+    executeTwoTasks(task -> submitListenableRunnable.invoke(EXECUTOR, task));
   }
 
   @Test
   void submitListenableCallable() {
-    executeTwoTasks(task -> EXECUTOR.submitListenable((Callable<?>) task));
+    assumeTrue(submitListenableCallable != null);
+    executeTwoTasks(task -> submitListenableCallable.invoke(EXECUTOR, task));
   }
 
   private static void executeTwoTasks(ThrowingConsumer<AsyncTask> task) {

instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts

@@ -20,6 +20,9 @@ dependencies {
   testImplementation("org.hsqldb:hsqldb:2.0.0")
   testImplementation("com.h2database:h2:1.4.197")
   testImplementation("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
+
+  // latest version of spring data is not yet compatible with spring 7 yet
+  latestDepTestLibrary("org.springframework:spring-test:6.+") // documented limitation
 }
 
 otelJava {

instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebHttpAttributesGetter.java

@@ -13,40 +13,25 @@
 import java.lang.invoke.MethodType;
 import java.util.List;
 import javax.annotation.Nullable;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
 enum SpringWebHttpAttributesGetter
     implements HttpClientAttributesGetter<HttpRequest, ClientHttpResponse> {
   INSTANCE;
 
-  @Override
-  public String getHttpRequestMethod(HttpRequest httpRequest) {
-    return httpRequest.getMethod().name();
-  }
-
-  @Override
-  @Nullable
-  public String getUrlFull(HttpRequest httpRequest) {
-    return httpRequest.getURI().toString();
-  }
-
-  @Override
-  public List<String> getHttpRequestHeader(HttpRequest httpRequest, String name) {
-    return httpRequest.getHeaders().getOrDefault(name, emptyList());
-  }
-
   @Nullable private static final MethodHandle GET_STATUS_CODE;
-
   @Nullable private static final MethodHandle STATUS_CODE_VALUE;
+  @Nullable private static final MethodHandle GET_HEADERS;
 
   static {
+    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+
     MethodHandle getStatusCode = null;
     MethodHandle statusCodeValue = null;
     Class<?> httpStatusCodeClass = null;
 
-    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
-
     try {
       httpStatusCodeClass = Class.forName("org.springframework.http.HttpStatusCode");
     } catch (ClassNotFoundException e) {
@@ -73,6 +58,52 @@ public List<String> getHttpRequestHeader(HttpRequest httpRequest, String name) {
 
     GET_STATUS_CODE = getStatusCode;
     STATUS_CODE_VALUE = statusCodeValue;
+
+    // since spring web 7.0
+    MethodHandle methodHandle =
+        findGetHeadersMethod(MethodType.methodType(List.class, String.class, List.class));
+    if (methodHandle == null) {
+      // up to spring web 7.0
+      methodHandle =
+          findGetHeadersMethod(MethodType.methodType(Object.class, Object.class, Object.class));
+    }
+    GET_HEADERS = methodHandle;
+  }
+
+  private static MethodHandle findGetHeadersMethod(MethodType methodType) {
+    try {
+      return MethodHandles.lookup().findVirtual(HttpHeaders.class, "getOrDefault", methodType);
+    } catch (Throwable t) {
+      return null;
+    }
+  }
+
+  @Override
+  public String getHttpRequestMethod(HttpRequest httpRequest) {
+    return httpRequest.getMethod().name();
+  }
+
+  @Override
+  @Nullable
+  public String getUrlFull(HttpRequest httpRequest) {
+    return httpRequest.getURI().toString();
+  }
+
+  @Override
+  public List<String> getHttpRequestHeader(HttpRequest httpRequest, String name) {
+    return getHeader(httpRequest.getHeaders(), name);
+  }
+
+  @SuppressWarnings("unchecked") // casting MethodHandle.invoke result
+  private static List<String> getHeader(HttpHeaders headers, String name) {
+    if (GET_HEADERS != null) {
+      try {
+        return (List<String>) GET_HEADERS.invoke(headers, name, emptyList());
+      } catch (Throwable t) {
+        // ignore
+      }
+    }
+    return emptyList();
   }
 
   @Override
@@ -94,7 +125,7 @@ public Integer getHttpResponseStatusCode(
   @Override
   public List<String> getHttpResponseHeader(
       HttpRequest httpRequest, ClientHttpResponse clientHttpResponse, String name) {
-    return clientHttpResponse.getHeaders().getOrDefault(name, emptyList());
+    return getHeader(clientHttpResponse.getHeaders(), name);
   }
 
   @Override

smoke-tests/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
   implementation("io.opentelemetry.proto:opentelemetry-proto")
   implementation("org.testcontainers:testcontainers")
   implementation("com.fasterxml.jackson.core:jackson-databind")
-  implementation("com.google.protobuf:protobuf-java-util:4.33.0")
+  implementation("com.google.protobuf:protobuf-java-util:4.33.1")
   implementation("io.grpc:grpc-netty-shaded")
   implementation("io.grpc:grpc-protobuf")
   implementation("io.grpc:grpc-stub")

testing/dependencies-shaded-for-testing/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
   implementation("com.linecorp.armeria:armeria-junit5:1.33.4")
   implementation("com.google.errorprone:error_prone_annotations")
   implementation("io.opentelemetry.proto:opentelemetry-proto")
-  implementation("com.google.protobuf:protobuf-java-util:4.33.0")
+  implementation("com.google.protobuf:protobuf-java-util:4.33.1")
   implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
   // we'll replace caffeine shaded in armeria with a later version that doesn't use Unsafe. Caffeine