Skip to content

Fix Vert.x HTTP/2 test response body race #13102

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
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Oct 29, 2026
Merged

Fix Vert.x HTTP/2 test response body race #13102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd8a99
Fix Vert.x HTTP/2 body race DD_BEW2HQ
datadog-bits Oct 28, 2026
bd7f4e0
Extract Vert.x response collector DD_BEW2HQ
datadog-bits Oct 29, 2026
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
22 changes: 15 additions & 7 deletions ...b/vertx-web-5.0/src/test/java/server/HttpServerResponseEndHandlerInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import static org.junit.jupiter.api.Assumptions.assumeTrue;

import datadog.trace.agent.test.AbstractInstrumentationTest;
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpClientOptions;
import io.vertx.core.http.HttpClientResponse;
Expand All @@ -23,6 +23,8 @@
import java.net.ServerSocket;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.AbstractMap.SimpleEntry;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.AfterAll;
Expand Down Expand Up @@ -113,22 +115,28 @@ void wrapsApplicationEndHandlerOnVertx51Http2Response() throws Exception {
.setProtocolVersion(HttpVersion.HTTP_2)
.setHttp2ClearTextUpgrade(false));
try {
HttpClientResponse response =
Map.Entry<Integer, String> response =
client
.request(HttpMethod.GET, port, "localhost", "/end-handler-wrapper")
.compose(request -> request.send())
// Subscribe on the event loop before response data can be discarded.
.compose(request -> request.send().compose(this::collectResponse))
.toCompletionStage()
.toCompletableFuture()
.get(10, TimeUnit.SECONDS);
Buffer body =
response.body().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);

assertWrapped(response.statusCode(), body.toString(StandardCharsets.UTF_8), HTTP2_RESPONSE);
assertWrapped(response.getKey(), response.getValue(), HTTP2_RESPONSE);
Comment thread
cgcote marked this conversation as resolved.
} finally {
client.close().toCompletionStage().toCompletableFuture().get(10, TimeUnit.SECONDS);
}
}

private Future<Map.Entry<Integer, String>> collectResponse(HttpClientResponse response) {
return response
.body()
.map(
body ->
new SimpleEntry<>(response.statusCode(), body.toString(StandardCharsets.UTF_8)));
}

private static boolean hasVertx51Http1Response() {
return hasClass(HTTP1_RESPONSE);
}
Expand Down
Loading