wip

Author: jandro996

dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoIterator.java

@@ -69,6 +69,7 @@ private void fetchNext() {
             new Endpoint()
                 .type(Endpoint.Type.REST)
                 .operation(Endpoint.Operation.HTTP_REQUEST)
+                .resource(method + " " + path)
                 .path(path)
                 .method(method)
                 .requestBodyType(requestBody)

dd-java-agent/instrumentation/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/RequestMappingInfoWithPathPatternsIterator.java

@@ -73,6 +73,7 @@ private void fetchNext() {
             new Endpoint()
                 .type(Endpoint.Type.REST)
                 .operation(Endpoint.Operation.HTTP_REQUEST)
+                .resource(method + " " + path)
                 .path(path)
                 .method(method)
                 .requestBodyType(requestBody)

internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java

@@ -16,6 +16,7 @@ public class Endpoint {
   private String method;
   private String path;
   private String operation;
+  private String resource;
   private List<String> requestBodyType;
   private List<String> responseBodyType;
   private List<Integer> responseCode;
@@ -67,6 +68,15 @@ public Endpoint operation(final String operation) {
     return this;
   }
 
+  public String getResource() {
+    return resource;
+  }
+
+  public Endpoint resource(final String resource) {
+    this.resource = resource;
+    return this;
+  }
+
   public List<String> getRequestBodyType() {
     return requestBodyType;
   }

telemetry/src/main/java/datadog/telemetry/TelemetryRequestBody.java

@@ -327,12 +327,7 @@ public void writeEndpoint(final Endpoint endpoint) throws IOException {
       bodyWriter.name("path").value(endpoint.getPath());
     }
     bodyWriter.name("operation_name").value(endpoint.getOperation());
-    bodyWriter
-        .name("resource_name")
-        .value(
-            endpoint.getMethod() != null && endpoint.getPath() != null
-                ? endpoint.getMethod() + " " + endpoint.getPath()
-                : "UNDEFINED");
+    bodyWriter.name("resource_name").value(endpoint.getResource());
     if (endpoint.getRequestBodyType() != null) {
       bodyWriter.name("request-body-type").jsonValue(endpoint.getRequestBodyType());
     }