re enable advice for tracing, and check earlier if work is not needed

Author: vandonr

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

@@ -37,7 +37,8 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
       postProcessorFactory = IastPostProcessorFactory.INSTANCE;
       return true;
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
+    return enabledSystems.contains(TargetSystem.TRACING)
+        || enabledSystems.contains(TargetSystem.APPSEC);
   }
 
   @Override

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

@@ -41,6 +41,9 @@ public static void updateRouteFromContext(
       final RoutingContext routingContext,
       final AgentSpan parentSpan,
       final AgentSpan handlerSpan) {
+    if (parentSpan == null && handlerSpan == null) {
+      return;
+    }
     if (routingContext.currentRoute() == null) {
       return;
     }
@@ -60,14 +63,11 @@ public static void updateRouteFromContext(
     updateRoute(routingContext, method, path, parentSpan, handlerSpan);
   }
 
-  public static boolean shouldUpdateRoute(
+  private static boolean shouldUpdateRoute(
       final RoutingContext routingContext,
       final AgentSpan parentSpan,
       final AgentSpan handlerSpan,
       final String path) {
-    if (parentSpan == null && handlerSpan == null) {
-      return false;
-    }
     final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
     if (currentRoute != null && currentRoute.equals(path)) {
       return false;

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

@@ -35,7 +35,8 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
       postProcessorFactory = IastPostProcessorFactory.INSTANCE;
       return true;
     }
-    return enabledSystems.contains(TargetSystem.APPSEC);
+    return enabledSystems.contains(TargetSystem.TRACING)
+        || enabledSystems.contains(TargetSystem.APPSEC);
   }
 
   @Override

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

@@ -41,6 +41,9 @@ public static void updateRouteFromContext(
       final RoutingContext routingContext,
       final AgentSpan parentSpan,
       final AgentSpan handlerSpan) {
+    if (parentSpan == null && handlerSpan == null) {
+      return;
+    }
     if (routingContext.currentRoute() == null) {
       return;
     }
@@ -62,14 +65,11 @@ public static void updateRouteFromContext(
     updateRoute(routingContext, method, path, parentSpan, handlerSpan);
   }
 
-  public static boolean shouldUpdateRoute(
+  private static boolean shouldUpdateRoute(
       final RoutingContext routingContext,
       final AgentSpan parentSpan,
       final AgentSpan handlerSpan,
       final String path) {
-    if (parentSpan == null && handlerSpan == null) {
-      return false;
-    }
     final String currentRoute = routingContext.get(ROUTE_CONTEXT_KEY);
     if (currentRoute != null && currentRoute.equals(path)) {
       return false;