Add more tags to ping

Author: amarziali

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java

@@ -7,6 +7,7 @@
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_UPLOAD_TIMEOUT;
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_UPLOAD_TIMEOUT_DEFAULT;
 import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
+import static datadog.trace.util.TraceUtils.normalizeTag;
 
 import com.squareup.moshi.JsonWriter;
 import datadog.common.container.ContainerInfo;
@@ -309,7 +310,7 @@ private RequestBody makeTelemetryRequestBody(@Nonnull String payload, boolean is
         if (isPing) {
           writer.name("level").value("DEBUG");
           writer.name("is_sensitive").value(false);
-          writer.name("tags").value("is_crash_ping:true");
+          writer.name("tags").value(tagsForPing(storedConfig.reportUUID));
         } else {
           writer.name("level").value("ERROR");
           writer.name("tags").value("severity:crash");
@@ -347,6 +348,19 @@ private RequestBody makeTelemetryRequestBody(@Nonnull String payload, boolean is
     }
   }
 
+  private String tagsForPing(String uuid) {
+    final StringBuilder tags = new StringBuilder("is_crash_ping:true");
+    tags.append(",").append("language_name:jvm");
+    tags.append(",").append(normalizeTag("service:" + storedConfig.service));
+    tags.append(",")
+        .append(
+            normalizeTag(
+                "language_version:" + SystemProperties.getOrDefault("java.version", "unknown")));
+    tags.append(",").append(normalizeTag("tracer_version:" + VersionInfo.VERSION));
+    tags.append(",").append("uuid:").append(uuid);
+    return (tags.toString());
+  }
+
   private void handleCall(final Call call, String kind) {
     try (Response response = call.execute()) {
       handleSuccess(call, response, kind);

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java

@@ -11,6 +11,7 @@
 import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
+import datadog.trace.util.TraceUtils;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -163,8 +164,13 @@ public void testCrashPing() throws Exception {
     assertEquals("DEBUG", event.get("payload").get(0).get("level").asText());
 
     assertFalse(event.get("payload").get(0).get("is_sensitive").asBoolean());
-    assertTrue(event.get("payload").get(0).get("tags").asText().contains("is_crash_ping:true"));
-
+    String tags = event.get("payload").get(0).get("tags").asText();
+    assertNotNull(tags);
+    assertTrue(tags.contains("is_crash_ping:true"));
+    assertTrue(tags.contains(TraceUtils.normalizeTag("service:" + crashConfig.service)));
+    assertTrue(tags.contains("uuid:" + crashConfig.reportUUID));
+    assertTrue(tags.contains(TraceUtils.normalizeTag("tracer_version:" + VersionInfo.VERSION)));
+    assertTrue(tags.contains("language_name:jvm"));
     assertEquals(expected, event.get("payload").get(0).get("message").asText());
     assertCommonPayload(event);
   }