Use local root span to set resource name

Author: sarahchen6

dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsDecorator.java

@@ -7,6 +7,7 @@
 import datadog.trace.bootstrap.ClassHierarchyIterable;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
+import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
@@ -68,10 +69,18 @@ public void onJakartaRsSpan(
     } else {
       span.setResourceName(DECORATE.spanNameForMethod(target, method));
 
-      if (parent == parent.getLocalRootSpan()) {
+      if (parent.getLocalRootSpan().getResourceNamePriority()
+          < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
         parent.setTag(Tags.COMPONENT, "jakarta-rs");
+
+        // current handler is a filter
+        if (!httpMethodAndRoute.hasLeft()
+            && (!httpMethodAndRoute.hasRight() || httpMethodAndRoute.getRight().length() == 0)) {
+          return;
+        }
+
         HTTP_RESOURCE_DECORATOR.withRoute(
-            parent, httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
+            parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
       }
     }
   }

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

@@ -69,6 +69,8 @@ private void setRoute(RoutingContext routingContext) {
       return;
     }
 
+    final AgentSpan routeSpan = parentSpan.getLocalRootSpan();
+
     final String method = routingContext.request().rawMethod();
     String mountPoint = routingContext.mountPoint();
     String path = routingContext.currentRoute().getPath();
@@ -81,9 +83,9 @@ private void setRoute(RoutingContext routingContext) {
       }
       path = mountPoint + path;
     }
-    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+    if (method != null && path != null && shouldUpdateRoute(routingContext, routeSpan, path)) {
       routingContext.put(ROUTE_CONTEXT_KEY, path);
-      HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
+      HTTP_RESOURCE_DECORATOR.withRoute(routeSpan, method, path, true);
     }
   }
 

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

@@ -66,6 +66,8 @@ private void setRoute(RoutingContext routingContext) {
       return;
     }
 
+    final AgentSpan routeSpan = parentSpan.getLocalRootSpan();
+
     final String method = routingContext.request().method().name();
     final String mountPoint = routingContext.mountPoint();
 
@@ -82,9 +84,9 @@ private void setRoute(RoutingContext routingContext) {
               : mountPoint;
       path = noBackslashhMountPoint + path;
     }
-    if (method != null && path != null && shouldUpdateRoute(routingContext, parentSpan, path)) {
+    if (method != null && path != null && shouldUpdateRoute(routingContext, routeSpan, path)) {
       routingContext.put(ROUTE_CONTEXT_KEY, path);
-      HTTP_RESOURCE_DECORATOR.withRoute(parentSpan, method, path, true);
+      HTTP_RESOURCE_DECORATOR.withRoute(routeSpan, method, path, true);
     }
   }