Skip to content

Commit 4e0dbb1

Browse files
committed
don't override route with / in vertx instrumentation
1 parent c62a6fc commit 4e0dbb1

File tree

2 files changed

+10
-2
lines changed
  • dd-java-agent/instrumentation

2 files changed

+10
-2
lines changed

dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/EndHandlerWrapper.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.DECORATE;
88

99
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
10+
import datadog.trace.bootstrap.instrumentation.api.Tags;
1011
import io.vertx.core.Handler;
1112
import io.vertx.ext.web.RoutingContext;
1213

@@ -29,7 +30,10 @@ public void handle(final Void event) {
2930
actual.handle(event);
3031
}
3132
} finally {
32-
if (path != null && parentSpan != null) {
33+
if (path != null
34+
&& parentSpan != null
35+
// do not override route with a "/" if it's already set (it's probably more meaningful)
36+
&& !(path.equals("/") && parentSpan.getTag(Tags.HTTP_ROUTE) != null)) {
3337
HTTP_RESOURCE_DECORATOR.withRoute(
3438
parentSpan, routingContext.request().rawMethod(), path, true);
3539
}

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/EndHandlerWrapper.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.DECORATE;
88

99
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
10+
import datadog.trace.bootstrap.instrumentation.api.Tags;
1011
import io.vertx.core.Handler;
1112
import io.vertx.ext.web.RoutingContext;
1213

@@ -29,7 +30,10 @@ public void handle(final Void event) {
2930
actual.handle(event);
3031
}
3132
} finally {
32-
if (path != null && parentSpan != null) {
33+
if (path != null
34+
&& parentSpan != null
35+
// do not override route with a "/" if it's already set (it's probably more meaningful)
36+
&& !(path.equals("/") && parentSpan.getTag(Tags.HTTP_ROUTE) != null)) {
3337
HTTP_RESOURCE_DECORATOR.withRoute(
3438
parentSpan, routingContext.request().method().name(), path, true);
3539
}

0 commit comments

Comments
 (0)