wip

Author: jandro996

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

@@ -317,18 +317,30 @@ public void beginEndpoints() throws IOException {
 
   public void writeEndpoint(final Endpoint endpoint) throws IOException {
     bodyWriter.beginObject();
-    bodyWriter.name("type").value(endpoint.getType());
-    bodyWriter.name("method").value(endpoint.getMethod());
-    bodyWriter.name("path").value(endpoint.getPath());
-    bodyWriter.name("operation-name").value(endpoint.getOperation());
+    if (endpoint.getType() != null) {
+      bodyWriter.name("type").value(endpoint.getType());
+    }
+    if (endpoint.getMethod() != null) {
+      bodyWriter.name("method").value(endpoint.getMethod());
+    }
+    if (endpoint.getPath() != null) {
+      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");
     if (endpoint.getRequestBodyType() != null) {
       bodyWriter.name("request-body-type").jsonValue(endpoint.getRequestBodyType());
     }
     if (endpoint.getResponseBodyType() != null) {
-      bodyWriter.name("response-body-type").jsonValue(endpoint.getResponseBodyType());
+      bodyWriter.name("response_body_type").jsonValue(endpoint.getResponseBodyType());
     }
     if (endpoint.getResponseCode() != null) {
-      bodyWriter.name("response-code").jsonValue(endpoint.getResponseCode());
+      bodyWriter.name("response_code").jsonValue(endpoint.getResponseCode());
     }
     if (endpoint.getAuthentication() != null) {
       bodyWriter.name("authentication").jsonValue(endpoint.getAuthentication());

telemetry/src/test/groovy/datadog/telemetry/TestTelemetryRouter.groovy

@@ -273,22 +273,29 @@ class TestTelemetryRouter extends TelemetryRouter {
       def expected = []
       endpoints.each {
         final item = [
-          'type'          : it.type,
-          'method'        : it.method,
-          'path'          : it.path,
-          'operation-name': it.operation
+          'operation_name': it.operation,
+          'resource_name' : it.method + ' ' + it.path,
         ] as Map<String, Object>
+        if (it.type) {
+          item['type'] = it.type
+        }
+        if (it.method) {
+          item['method'] = it.method
+        }
+        if (it.path) {
+          item['path'] = it.path
+        }
         if (it.requestBodyType) {
-          item['request-body-type'] = it.requestBodyType
+          item['request_body_type'] = it.requestBodyType
         }
         if (it.responseBodyType) {
-          item['response-body-type'] = it.responseBodyType
+          item['response_body_type'] = it.responseBodyType
         }
         if (it.authentication) {
           item['authentication'] = it.authentication
         }
         if (it.responseCode) {
-          item['response-code'] = it.responseCode
+          item['response_code'] = it.responseCode
         }
         if (it.metadata) {
           item['metadata'] = it.metadata