Skip to content

Fix jetty-httpclient-12 testlatestdeps #14467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
+39 −19
Merged

Fix jetty-httpclient-12 testlatestdeps #14467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 39 additions & 19 deletions ...va/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand All @@ -50,7 +50,7 @@ public void before() throws Exception {
}

@AfterEach
public void after() throws Exception {
void after() throws Exception {
client.stop();
httpsClient.stop();
}
Expand Down Expand Up @@ -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(
Expand All @@ -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;
Expand Down