Merge branch 'main' into couchbase-metadata

Author: jaydeluca

conventions/build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1.1")
   implementation("org.owasp:dependency-check-gradle:12.1.3")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java

@@ -14,11 +14,11 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jetty.client.ContentResponse;
-import org.eclipse.jetty.client.FutureResponseListener;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.client.Response;
@@ -39,7 +39,7 @@ public abstract class AbstractJettyClient12Test extends AbstractHttpClientTest<R
   protected HttpClient httpsClient;
 
   @BeforeEach
-  public void before() throws Exception {
+  void before() throws Exception {
     client.setConnectTimeout(CONNECTION_TIMEOUT.toMillis());
     client.start();
 
@@ -50,7 +50,7 @@ public void before() throws Exception {
   }
 
   @AfterEach
-  public void after() throws Exception {
+  void after() throws Exception {
     client.stop();
     httpsClient.stop();
   }
@@ -118,25 +118,12 @@ public void sendRequestWithCallback(
   void callbacksCalled() throws InterruptedException, ExecutionException {
     URI uri = resolveAddress("/success");
     Request request = client.newRequest(uri).method("GET");
-    FutureResponseListener responseListener =
-        new FutureResponseListener(request) {
-          @Override
-          public void onHeaders(Response response) {
-            testing.runWithSpan("onHeaders", () -> super.onHeaders(response));
-          }
 
-          @Override
-          public void onSuccess(Response response) {
-            testing.runWithSpan("onSuccess", () -> super.onSuccess(response));
-          }
+    CompletableFuture<Response> responseFuture = new CompletableFuture<>();
+    TracingResponseListener responseListener = new TracingResponseListener(responseFuture);
 
-          @Override
-          public void onComplete(Result result) {
-            testing.runWithSpan("onComplete", () -> super.onComplete(result));
-          }
-        };
     testing.runWithSpan("parent", () -> request.send(responseListener));
-    Response response = responseListener.get();
+    Response response = responseFuture.get();
 
     assertThat(response.getStatus()).isEqualTo(200);
     testing.waitAndAssertTraces(
@@ -162,6 +149,39 @@ public void onComplete(Result result) {
                         .hasParent(trace.getSpan(0))));
   }
 
+  private class TracingResponseListener
+      implements Response.HeadersListener, Response.SuccessListener, Response.CompleteListener {
+
+    private final CompletableFuture<Response> responseFuture;
+
+    TracingResponseListener(CompletableFuture<Response> responseFuture) {
+      this.responseFuture = responseFuture;
+    }
+
+    @Override
+    public void onHeaders(Response response) {
+      testing.runWithSpan("onHeaders", () -> {});
+    }
+
+    @Override
+    public void onSuccess(Response response) {
+      testing.runWithSpan("onSuccess", () -> {});
+    }
+
+    @Override
+    public void onComplete(Result result) {
+      testing.runWithSpan(
+          "onComplete",
+          () -> {
+            if (result.isSucceeded()) {
+              responseFuture.complete(result.getResponse());
+            } else {
+              responseFuture.completeExceptionally(result.getFailure());
+            }
+          });
+    }
+  }
+
   private static class JettyClientListener
       implements Request.FailureListener, Response.FailureListener {
     volatile Throwable failure;

settings.gradle.kts

@@ -20,7 +20,7 @@ plugins {
   // ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PsmokeTestServer=jetty
   // ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PsmokeTestServer=jetty
   id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
-  id("com.gradle.develocity") version "4.1"
+  id("com.gradle.develocity") version "4.1.1"
 }
 
 dependencyResolutionManagement {