Skip to content

fix(vertx-web): finish vertx.route-handler via RoutingContext.addEndHandler fallback #11312

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

Draft
zarirhamza wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −9
Draft

fix(vertx-web): finish vertx.route-handler via RoutingContext.addEndHandler fallback #11312

Show file tree
Hide file tree
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
10 changes: 1 addition & 9 deletions ...b-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package datadog.trace.instrumentation.vertx_4_0.server;

import static datadog.trace.instrumentation.vertx_4_0.server.RouteHandlerWrapper.HANDLER_SPAN_CONTEXT_KEY;
import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.DECORATE;

import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.vertx.core.Handler;
import io.vertx.ext.web.RoutingContext;

Expand All @@ -18,16 +14,12 @@ public class EndHandlerWrapper implements Handler<Void> {

@Override
public void handle(final Void event) {
AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
try {
if (actual != null) {
actual.handle(event);
}
} finally {
if (span != null) {
DECORATE.onResponse(span, routingContext.response());
span.finish();
}
RouteHandlerWrapper.finishHandlerSpan(routingContext);
}
}
}
23 changes: 23 additions & 0 deletions ...4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ public void handle(final RoutingContext routingContext) {
routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);

routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
// Fallback finish path: HttpServerResponse.endHandler is silently skipped
// by Vert.x's Http1xServerResponse.end() when the underlying connection
// has already closed (Http1xServerResponse#end gates `endHandler.handle()`
// behind `!closed`). This happens in synthetic transports such as
// quarkus-amazon-lambda-rest's virtual Netty channel, where writes and
// close are synchronous in-memory, leaving the route-handler span unfinished
// and orphaning all jakarta-rs.request / aws.http child spans in the trace.
// RoutingContext#addEndHandler fires on routing-context completion regardless
// of underlying connection state and on both success and failure.
routingContext.addEndHandler(ar -> finishHandlerSpan(routingContext));
DECORATE.afterStart(span);
span.setResourceName(DECORATE.className(actual.getClass()));
}
Expand All @@ -60,6 +70,19 @@ public void handle(final RoutingContext routingContext) {
}
}

// Idempotently finish the route-handler span. Both EndHandlerWrapper (the
// response.endHandler path) and the routingContext.addEndHandler fallback may call
// this; the first one to win clears HANDLER_SPAN_CONTEXT_KEY so the second is a no-op.
static void finishHandlerSpan(final RoutingContext routingContext) {
final AgentSpan span = routingContext.get(HANDLER_SPAN_CONTEXT_KEY);
if (span == null) {
return;
}
routingContext.put(HANDLER_SPAN_CONTEXT_KEY, null);
DECORATE.onResponse(span, routingContext.response());
span.finish();
}

private void setRoute(RoutingContext routingContext) {
final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
if (parentSpan == null) {
Expand Down
Loading