Skip to content

Commit 739a9b9

Browse files
committed
Add http.route guard
1 parent 8b0a96d commit 739a9b9

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

  • dd-java-agent/instrumentation/vertx/vertx-web

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
1212
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
13+
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
1314
import datadog.trace.bootstrap.instrumentation.api.Tags;
1415
import io.vertx.core.Handler;
1516
import io.vertx.ext.web.RoutingContext;
@@ -97,6 +98,10 @@ static boolean shouldUpdateRoute(
9798
if (span == null) {
9899
return false;
99100
}
101+
if (span.getTag(Tags.HTTP_ROUTE) != null
102+
&& span.getResourceNamePriority() > ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
103+
return false;
104+
}
100105
final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
101106
if (currentRoute != null && currentRoute.equals(path)) {
102107
return false;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
1212
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
13+
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
1314
import datadog.trace.bootstrap.instrumentation.api.Tags;
1415
import io.vertx.core.Handler;
1516
import io.vertx.ext.web.RoutingContext;
@@ -98,6 +99,10 @@ static boolean shouldUpdateRoute(
9899
if (span == null) {
99100
return false;
100101
}
102+
if (span.getTag(Tags.HTTP_ROUTE) != null
103+
&& span.getResourceNamePriority() > ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
104+
return false;
105+
}
101106
final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
102107
if (currentRoute != null && currentRoute.equals(path)) {
103108
return false;

0 commit comments

Comments
 (0)