Skip to content

Do not override route with / in vertx instrumentation #8881

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
May 28, 2025
Merged

Do not override route with / in vertx instrumentation #8881

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
6 changes: 5 additions & 1 deletion ...b-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.DECORATE;

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

Expand All @@ -29,7 +30,10 @@ public void handle(final Void event) {
actual.handle(event);
}
} finally {
if (path != null && parentSpan != null) {
if (path != null
&& parentSpan != null
// do not override route with a "/" if it's already set (it's probably more meaningful)
&& !(path.equals("/") && parentSpan.getTag(Tags.HTTP_ROUTE) != null)) {
HTTP_RESOURCE_DECORATOR.withRoute(
parentSpan, routingContext.request().rawMethod(), path, true);
}
Expand Down
6 changes: 5 additions & 1 deletion ...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
Expand Up @@ -7,6 +7,7 @@
import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.DECORATE;

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

Expand All @@ -29,7 +30,10 @@ public void handle(final Void event) {
actual.handle(event);
}
} finally {
if (path != null && parentSpan != null) {
if (path != null
&& parentSpan != null
// do not override route with a "/" if it's already set (it's probably more meaningful)
&& !(path.equals("/") && parentSpan.getTag(Tags.HTTP_ROUTE) != null)) {
HTTP_RESOURCE_DECORATOR.withRoute(
parentSpan, routingContext.request().method().name(), path, true);
}
Expand Down
Loading