Merge remote-tracking branch 'upstream/main' into java23

Author: trask

CONTRIBUTING.md

@@ -89,6 +89,9 @@ https://gradle.com/s/ila4qwp5lcf5s
 Opening the build scan link can sometimes take several seconds (it's a large build), but it
 typically makes it a lot clearer what's failing.
 
+You can also try the "Explain error" button at the top of the GitHub Actions page,
+which often does a reasonable job of parsing the long build log and displaying the important part.
+
 ### Draft PRs
 
 Draft PRs are welcome, especially when exploring new ideas or experimenting with a hypothesis.

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
 
-  testImplementation("org.testcontainers:testcontainers:1.20.2")
-  testImplementation("org.testcontainers:postgresql:1.20.2")
+  testImplementation("org.testcontainers:testcontainers:1.20.3")
+  testImplementation("org.testcontainers:postgresql:1.20.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

examples/distro/smoke-tests/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.20.2")
+  testImplementation("org.testcontainers:testcontainers:1.20.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0")
   testImplementation("com.google.protobuf:protobuf-java-util:3.25.5")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

examples/extension/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.17.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:1.20.2")
+  testImplementation("org.testcontainers:testcontainers:1.20.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0")
   testImplementation("com.google.protobuf:protobuf-java-util:3.25.5")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy

@@ -0,0 +1,97 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.jaxrsclient;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientHandlerException;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter;
+import com.sun.jersey.api.client.filter.LoggingFilter;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
+import io.opentelemetry.semconv.NetworkAttributes;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class JaxRsClientV1Test extends AbstractHttpClientTest<WebResource.Builder> {
+  @RegisterExtension
+  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
+
+  private final Client client = buildClient(false);
+  private final Client clientWithReadTimeout = buildClient(true);
+
+  private static Client buildClient(boolean readTimeout) {
+    Client client = Client.create();
+    client.setConnectTimeout((int) CONNECTION_TIMEOUT.toMillis());
+    if (readTimeout) {
+      client.setReadTimeout((int) READ_TIMEOUT.toMillis());
+    }
+    // Add filters to ensure spans aren't duplicated.
+    client.addFilter(new LoggingFilter());
+    client.addFilter(new GZIPContentEncodingFilter());
+
+    return client;
+  }
+
+  @Override
+  protected void configure(HttpClientTestOptions.Builder options) {
+    options.setTestCircularRedirects(false);
+    options.setTestNonStandardHttpMethod(false);
+    options.setTestCallback(false);
+    options.setHttpAttributes(
+        serverEndpoint -> {
+          Set<AttributeKey<?>> attributes =
+              new HashSet<>(HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES);
+          attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION);
+          return attributes;
+        });
+  }
+
+  @AfterAll
+  void tearDown() {
+    client.destroy();
+    clientWithReadTimeout.destroy();
+  }
+
+  private Client getClient(URI uri) {
+    if (uri.toString().contains("/read-timeout")) {
+      return clientWithReadTimeout;
+    }
+    return client;
+  }
+
+  @Override
+  public WebResource.Builder buildRequest(String method, URI uri, Map<String, String> headers) {
+    WebResource.Builder builder = getClient(uri).resource(uri).getRequestBuilder();
+    headers.forEach(builder::header);
+    return builder;
+  }
+
+  @Override
+  public int sendRequest(
+      WebResource.Builder builder, String method, URI uri, Map<String, String> headers)
+      throws Exception {
+    String body = "POST".equals(method) || "PUT".equals(method) ? "" : null;
+    try {
+      return builder.method(method, ClientResponse.class, body).getStatus();
+    } catch (ClientHandlerException exception) {
+      Throwable cause = exception.getCause();
+      if (cause instanceof Exception) {
+        throw (Exception) cause;
+      }
+      throw new IllegalStateException(cause);
+    }
+  }
+}