Fix failing tests

Author: manuel-alvarez-alvarez

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

@@ -17,7 +17,9 @@
 import io.vertx.ext.web.impl.RouterImpl;
 
 public class RouteHandlerWrapper implements Handler<RoutingContext> {
+  static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
   static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
+  static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
 
   private final Handler<RoutingContext> actual;
   private final boolean spanStarter;
@@ -40,16 +42,16 @@ public void handle(final RoutingContext routingContext) {
     if (spanStarter) {
       if (span == null) {
         AgentSpan parentSpan = activeSpan();
+        routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
 
         span = startSpan(INSTRUMENTATION_NAME);
         routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
 
         routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
         DECORATE.afterStart(span);
         span.setResourceName(DECORATE.className(actual.getClass()));
-
-        setRoute(parentSpan, routingContext);
       }
+      setRoute(routingContext);
     }
     try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) {
       try {
@@ -61,7 +63,12 @@ public void handle(final RoutingContext routingContext) {
     }
   }
 
-  private void setRoute(AgentSpan parentSpan, RoutingContext routingContext) {
+  private void setRoute(RoutingContext routingContext) {
+    final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
+    if (parentSpan == null) {
+      return;
+    }
+
     final String method = routingContext.request().rawMethod();
     String mountPoint = routingContext.mountPoint();
     String path = routingContext.currentRoute().getPath();
@@ -74,15 +81,21 @@ private void setRoute(AgentSpan parentSpan, RoutingContext routingContext) {
       }
       path = mountPoint + path;
     }
-    if (method != null && path != null && shouldUpdateRoute(parentSpan, path)) {
+    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+      routingContext.put(ROUTE_CONTEXT_KEY, path);
       HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
     }
   }
 
-  static boolean shouldUpdateRoute(final AgentSpan span, final String path) {
+  static boolean shouldUpdateRoute(
+      final RoutingContext routingContext, final AgentSpan span, final String path) {
     if (span == null) {
       return false;
     }
+    final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
+    if (currentRoute != null && currentRoute.equals(path)) {
+      return false;
+    }
     // do not override route with a "/" if it's already set (it's probably more meaningful)
     return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
   }

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

@@ -16,7 +16,9 @@
 import io.vertx.ext.web.impl.RouteImpl;
 
 public class RouteHandlerWrapper implements Handler<RoutingContext> {
+  static final String PARENT_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".parent";
   static final String HANDLER_SPAN_CONTEXT_KEY = AgentSpan.class.getName() + ".handler";
+  static final String ROUTE_CONTEXT_KEY = "dd." + Tags.HTTP_ROUTE;
 
   private final Handler<RoutingContext> actual;
   private final boolean spanStarter;
@@ -36,16 +38,16 @@ public void handle(final RoutingContext routingContext) {
     if (spanStarter) {
       if (span == null) {
         AgentSpan parentSpan = activeSpan();
+        routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
 
         span = startSpan(INSTRUMENTATION_NAME);
         routingContext.put(HANDLER_SPAN_CONTEXT_KEY, span);
 
         routingContext.response().endHandler(new EndHandlerWrapper(routingContext));
         DECORATE.afterStart(span);
         span.setResourceName(DECORATE.className(actual.getClass()));
-
-        setRoute(parentSpan, routingContext);
       }
+      setRoute(routingContext);
     }
 
     try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) {
@@ -58,7 +60,12 @@ public void handle(final RoutingContext routingContext) {
     }
   }
 
-  private void setRoute(AgentSpan parentSpan, RoutingContext routingContext) {
+  private void setRoute(RoutingContext routingContext) {
+    final AgentSpan parentSpan = routingContext.get(PARENT_SPAN_CONTEXT_KEY);
+    if (parentSpan == null) {
+      return;
+    }
+
     final String method = routingContext.request().method().name();
     final String mountPoint = routingContext.mountPoint();
 
@@ -72,15 +79,21 @@ private void setRoute(AgentSpan parentSpan, RoutingContext routingContext) {
               : mountPoint;
       path = noBackslashhMountPoint + path;
     }
-    if (method != null && path != null && shouldUpdateRoute(parentSpan, path)) {
+    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+      routingContext.put(ROUTE_CONTEXT_KEY, path);
       HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
     }
   }
 
-  static boolean shouldUpdateRoute(final AgentSpan span, final String path) {
+  static boolean shouldUpdateRoute(
+      final RoutingContext routingContext, final AgentSpan span, final String path) {
     if (span == null) {
       return false;
     }
+    final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
+    if (currentRoute != null && currentRoute.equals(path)) {
+      return false;
+    }
     // do not override route with a "/" if it's already set (it's probably more meaningful)
     return !path.equals("/") || span.getTag(Tags.HTTP_ROUTE) == null;
   }