Set the http.route also in the play span

Author: manuel-alvarez-alvarez

dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayHttpServerDecorator.java

@@ -23,6 +23,7 @@ public class PlayHttpServerDecorator
   public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
   public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
   public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+  private static final boolean API_SECURITY_ENABLED = Config.get().isApiSecurityEnabled();
 
   @Override
   protected String[] instrumentationNames() {
@@ -87,15 +88,20 @@ public AgentSpan onRequest(
       final Option pathOption = request.tags().get(Routes.ROUTE_PATTERN());
       if (!pathOption.isEmpty()) {
         final String path = (String) pathOption.get();
-        HTTP_RESOURCE_DECORATOR.withRoute(spanForHttpRoute(span), request.method(), path);
+        handleRoute(span, request.method(), path);
       }
     }
     return span;
   }
 
-  private AgentSpan spanForHttpRoute(final AgentSpan span) {
-    final AgentSpan rootSpan = span.getLocalRootSpan();
-    return rootSpan == null ? span : rootSpan;
+  private void handleRoute(final AgentSpan span, final String method, final String route) {
+    HTTP_RESOURCE_DECORATOR.withRoute(span, method, route);
+    if (API_SECURITY_ENABLED) {
+      final AgentSpan root = span.getLocalRootSpan();
+      if (root != null) {
+        HTTP_RESOURCE_DECORATOR.withRoute(root, method, route);
+      }
+    }
   }
 
   @Override

dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java

@@ -23,6 +23,7 @@ public class PlayHttpServerDecorator
   public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
   public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
   public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+  private static final boolean API_SECURITY_ENABLED = Config.get().isApiSecurityEnabled();
 
   @Override
   protected String[] instrumentationNames() {
@@ -87,15 +88,20 @@ public AgentSpan onRequest(
       final Option pathOption = request.tags().get("ROUTE_PATTERN");
       if (!pathOption.isEmpty()) {
         final String path = (String) pathOption.get();
-        HTTP_RESOURCE_DECORATOR.withRoute(spanForHttpRoute(span), request.method(), path);
+        handleRoute(span, request.method(), path);
       }
     }
     return span;
   }
 
-  private AgentSpan spanForHttpRoute(final AgentSpan span) {
-    final AgentSpan rootSpan = span.getLocalRootSpan();
-    return rootSpan == null ? span : rootSpan;
+  private void handleRoute(final AgentSpan span, final String method, final String route) {
+    HTTP_RESOURCE_DECORATOR.withRoute(span, method, route);
+    if (API_SECURITY_ENABLED) {
+      final AgentSpan root = span.getLocalRootSpan();
+      if (root != null) {
+        HTTP_RESOURCE_DECORATOR.withRoute(root, method, route);
+      }
+    }
   }
 
   @Override

dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java

@@ -32,6 +32,7 @@ public class PlayHttpServerDecorator
   public static final CharSequence PLAY_REQUEST = UTF8BytesString.create("play.request");
   public static final CharSequence PLAY_ACTION = UTF8BytesString.create("play-action");
   public static final PlayHttpServerDecorator DECORATE = new PlayHttpServerDecorator();
+  private static final boolean API_SECURITY_ENABLED = Config.get().isApiSecurityEnabled();
 
   private static final MethodHandle TYPED_KEY_GET_UNDERLYING;
 
@@ -141,15 +142,20 @@ public AgentSpan onRequest(
         CharSequence path =
             PATH_CACHE.computeIfAbsent(
                 defOption.get().path(), p -> addMissingSlash(p, request.path()));
-        HTTP_RESOURCE_DECORATOR.withRoute(spanForHttpRoute(span), request.method(), path, true);
+        handleRoute(span, request.method(), path);
       }
     }
     return span;
   }
 
-  private AgentSpan spanForHttpRoute(final AgentSpan span) {
-    final AgentSpan rootSpan = span.getLocalRootSpan();
-    return rootSpan == null ? span : rootSpan;
+  private void handleRoute(final AgentSpan span, final String method, final CharSequence route) {
+    HTTP_RESOURCE_DECORATOR.withRoute(span, method, route, true);
+    if (API_SECURITY_ENABLED) {
+      final AgentSpan root = span.getLocalRootSpan();
+      if (root != null) {
+        HTTP_RESOURCE_DECORATOR.withRoute(root, method, route, true);
+      }
+    }
   }
 
   /*