Experimental change to prevent JAX-RS instrumentation from overriding play framework span resource names.

Author: ygree

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -317,6 +317,7 @@ public AgentSpan onResponseStatus(final AgentSpan span, final int status) {
     }
 
     if (SHOULD_SET_404_RESOURCE_NAME && status == 404) {
+      // TODO
       span.setResourceName(NOT_FOUND_RESOURCE_NAME, ResourceNamePriorities.HTTP_404);
     }
     return span;

dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java

@@ -57,7 +57,7 @@ public void onJaxRsSpan(
       // This check ensures that we only use the route from the first JAX-RS annotated method that
       // is executed
       if (parent.getLocalRootSpan().getResourceNamePriority()
-          < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) {
+          < ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE) { // TODO
         HTTP_RESOURCE_DECORATOR.withRoute(
             parent.getLocalRootSpan(), httpMethodAndRoute.getLeft(), httpMethodAndRoute.getRight());
         parent.getLocalRootSpan().setTag(Tags.COMPONENT, "jax-rs");

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

@@ -82,7 +82,7 @@ public static void stopTraceOnResponse(
     // set the resource name on the upstream akka/netty span if there is one
     if (rootSpan != null && playControllerSpan.getResourceName() != null) {
       rootSpan.setResourceName(
-          playControllerSpan.getResourceName(), ResourceNamePriorities.HTTP_PATH_NORMALIZER);
+          playControllerSpan.getResourceName(), ResourceNamePriorities.HTTP_FRAMEWORK_ROUTE);
     }
   }
 }

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy

@@ -169,7 +169,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
 
   String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
     if (endpoint.status == 404 && (changesAll404s() || endpoint.path == "/not-found")) {
-      return "404"
+      return "404" // TODO
     } else if (endpoint.hasPathParam) {
       return "$method ${testPathParam()}"
     }