Fix error tracking payload

Author: amarziali

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

@@ -155,7 +155,7 @@ public CrashUploader(@Nonnull final ConfigManager.StoredConfig storedConfig) {
             dispatcher, /* dispatcher */
             telemetryUrl, // will be overridden in each request
             true, /* retryOnConnectionFailure */
-            4, /* maxRunningRequests */ // allows 1 blocked ping and two crash request
+            4, /* maxRunningRequests */ // not having one request blocking the others
             configProvider.getString(CRASH_TRACKING_PROXY_HOST),
             configProvider.getInteger(CRASH_TRACKING_PROXY_PORT),
             configProvider.getString(CRASH_TRACKING_PROXY_USERNAME),
@@ -200,8 +200,7 @@ void sendPingToErrorTracking(String error) {
                   null,
                   "Crashtracker crash ping: "
                       + (error != null ? error : "crash processing started"),
-                  null,
-                  false),
+                  null),
               null,
               OSInfo.current(),
               null,
@@ -293,6 +292,7 @@ void uploadToLogs(@Nonnull String message, @Nonnull PrintStream out) throws IOEx
   }
 
   // @VisibleForTesting
+  @SuppressForbidden
   static String extractErrorKind(String fileContent) {
     Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
     if (!matcher.find()) {
@@ -324,6 +324,7 @@ static String extractErrorKind(String fileContent) {
           Pattern.DOTALL | Pattern.MULTILINE);
 
   // @VisibleForTesting
+  @SuppressForbidden
   static String extractErrorMessage(String fileContent) {
     Matcher matcher = ERROR_MESSAGE_PATTERN.matcher(fileContent);
     if (!matcher.find()) {
@@ -491,8 +492,23 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool
         writer.name("timestamp").value(payload.timestamp);
         writer.name("ddsource").value("crashtracker");
         // error payload
-        writer.name("error");
-        payload.error.writeAsJson(writer); // flat write an already serialized json object
+        if (payload.error != null) {
+          writer.name("error");
+          writer.beginObject();
+          writer.name("source_type").value("crashtracking");
+          if (!isPing) {
+            writer.name("is_crash").value(true);
+          }
+          writer.name("type").value(payload.error.kind);
+          writer.name("message").value(payload.error.message);
+          if (payload.error.stack != null) {
+            writer.name("stack");
+            // payload.error.message
+            payload.error.stack.writeAsJson(writer);
+            // flat write an already serialized json object
+          }
+          writer.endObject();
+        }
         // signal info
         if (payload.sigInfo != null) {
           writer.name("sig_info");

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/ErrorData.java

@@ -1,18 +1,11 @@
 package datadog.crashtracking.dto;
 
 import com.squareup.moshi.Json;
-import com.squareup.moshi.JsonAdapter;
-import com.squareup.moshi.JsonWriter;
-import com.squareup.moshi.Moshi;
-import java.io.IOException;
 import java.util.Objects;
 
 public final class ErrorData {
-  private static final JsonAdapter<ErrorData> ADAPTER =
-      new Moshi.Builder().build().adapter(ErrorData.class);
-
   @Json(name = "is_crash")
-  public final boolean isCrash;
+  public final boolean isCrash = true;
 
   public final String kind;
   public final String message;
@@ -23,14 +16,9 @@ public final class ErrorData {
   public final StackTrace stack;
 
   public ErrorData(String kind, String message, StackTrace stack) {
-    this(kind, message, stack, true);
-  }
-
-  public ErrorData(String kind, String message, StackTrace stack, boolean isCrash) {
     this.kind = kind;
     this.message = message;
     this.stack = stack;
-    this.isCrash = isCrash;
   }
 
   @Override
@@ -53,8 +41,4 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(isCrash, kind, message, sourceType, stack);
   }
-
-  public void writeAsJson(final JsonWriter writer) throws IOException {
-    ADAPTER.toJson(writer, this);
-  }
 }

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/dto/StackTrace.java

@@ -1,9 +1,15 @@
 package datadog.crashtracking.dto;
 
+import com.squareup.moshi.JsonAdapter;
+import com.squareup.moshi.JsonWriter;
+import com.squareup.moshi.Moshi;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Objects;
 
 public final class StackTrace {
+  private static final JsonAdapter<StackTrace> ADAPTER =
+      new Moshi.Builder().build().adapter(StackTrace.class);
   private static final String FORMAT = "CrashTrackerV1";
 
   public final String format = FORMAT;
@@ -29,4 +35,8 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(format, Arrays.hashCode(frames));
   }
+
+  public void writeAsJson(final JsonWriter writer) throws IOException {
+    ADAPTER.toJson(writer, this);
+  }
 }

dd-java-agent/agent-crashtracking/src/test/resources/golden/errortracking/sample-crash-for-telemetry-2.txt

@@ -1 +1 @@
-{"timestamp":"2024-09-20T13:19:06Z","ddsource":"crashtracker","error":{"is_crash":true,"kind":"SIGSEGV","message":"Process terminated by signal SIGSEGV","source_type":"crashtracking","stack":{"format":"CrashTrackerV1","frames":[{"file":"libpthread.so.0","function":"__pthread_clockjoin_ex"}]}},"sig_info":{"si_addr":"0x00007f011ab1ccd5 (sent by kill)","si_signo_human_readable":"SIGSEGV","si_signo":11},"os_info":{"architecture":"aarch64","bitness":"64","os_type":"Mac OS X","version":"15.7.1"},"ddtags":"host:COMP-LTD4YC2T2N,runtime-id:edbdef5c-7038-4286-97f8-e76bb65b281f,language:jvm,env:,version:,service:worker.org.gradle.process.internal.worker.GradleWorkerMain,is_crash:true,data_schema_version:1.0,language_name:jvm,language_version:1.8.0_345,tracer_version:1.56.0-snapshot_13a0b2e4c7,uuid:a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3"}
+{"timestamp":"2024-09-20T13:19:06Z","ddsource":"crashtracker","error":{"source_type":"crashtracking","is_crash":true,"type":"SIGSEGV","message":"Process terminated by signal SIGSEGV","stack":{"format":"CrashTrackerV1","frames":[{"file":"libpthread.so.0","function":"__pthread_clockjoin_ex"}]}},"sig_info":{"si_addr":"0x00007f011ab1ccd5 (sent by kill)","si_signo_human_readable":"SIGSEGV","si_signo":11}}

dd-java-agent/agent-crashtracking/src/test/resources/golden/errortracking/sample-crash-for-telemetry-3.txt

@@ -1 +1 @@
-{"ddsource":"crashtracker","error":{"is_crash":true,"kind":"INVALID","message":"Process terminated by signal INVALID","source_type":"crashtracking","stack":{"format":"CrashTrackerV1","frames":[{"file":"libjvm.dylib","function":"VMError::report_and_die()"},{"file":"libjvm.dylib","function":"report_vm_error(char const*, int, char const*, char const*)"},{"file":"libjvm.dylib","function":"report_java_out_of_memory(char const*)"},{"file":"libjvm.dylib","function":"CollectedHeap::common_mem_allocate_noinit(KlassHandle, unsigned long, Thread*)"},{"file":"libjvm.dylib","function":"TypeArrayKlass::allocate_common(int, bool, Thread*)"},{"file":"libjvm.dylib","function":"InterpreterRuntime::newarray(JavaThread*, BasicType, int)"},{"function":"datadog.smoketest.crashtracking.CrashtrackingTestApplication.main([Ljava/lang/String;)V","line":105},{"function":" ~StubRoutines::call_stub"},{"file":"libjvm.dylib","function":"JavaCalls::call_helper(JavaValue*, methodHandle*, JavaCallArguments*, Thread*)"},{"file":"libjvm.dylib","function":"jni_invoke_static(JNIEnv_*, JavaValue*, _jobject*, JNICallType, _jmethodID*, JNI_ArgumentPusher*, Thread*)"},{"file":"libjvm.dylib","function":"jni_CallStaticVoidMethod"},{"file":"java","function":"JavaMain"},{"file":"libsystem_pthread.dylib","function":"_pthread_start"},{"file":"libsystem_pthread.dylib","function":"thread_start"}]}},"sig_info":{"si_addr":"0x0000000000000000","si_signo_human_readable":"INVALID","si_signo":0},"os_info":{"architecture":"aarch64","bitness":"64","os_type":"Mac OS X","version":"15.7.1"},"ddtags":"host:COMP-LTD4YC2T2N,runtime-id:edbdef5c-7038-4286-97f8-e76bb65b281f,language:jvm,env:,version:,service:worker.org.gradle.process.internal.worker.GradleWorkerMain,is_crash:true,data_schema_version:1.0,language_name:jvm,language_version:1.8.0_345,tracer_version:1.56.0-snapshot_13a0b2e4c7,uuid:a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3"}
+{"ddsource":"crashtracker","error":{"source_type":"crashtracking","is_crash":true,"type":"INVALID","message":"Process terminated by signal INVALID","stack":{"format":"CrashTrackerV1","frames":[{"file":"libjvm.dylib","function":"VMError::report_and_die()"},{"file":"libjvm.dylib","function":"report_vm_error(char const*, int, char const*, char const*)"},{"file":"libjvm.dylib","function":"report_java_out_of_memory(char const*)"},{"file":"libjvm.dylib","function":"CollectedHeap::common_mem_allocate_noinit(KlassHandle, unsigned long, Thread*)"},{"file":"libjvm.dylib","function":"TypeArrayKlass::allocate_common(int, bool, Thread*)"},{"file":"libjvm.dylib","function":"InterpreterRuntime::newarray(JavaThread*, BasicType, int)"},{"function":"datadog.smoketest.crashtracking.CrashtrackingTestApplication.main([Ljava/lang/String;)V","line":105},{"function":" ~StubRoutines::call_stub"},{"file":"libjvm.dylib","function":"JavaCalls::call_helper(JavaValue*, methodHandle*, JavaCallArguments*, Thread*)"},{"file":"libjvm.dylib","function":"jni_invoke_static(JNIEnv_*, JavaValue*, _jobject*, JNICallType, _jmethodID*, JNI_ArgumentPusher*, Thread*)"},{"file":"libjvm.dylib","function":"jni_CallStaticVoidMethod"},{"file":"java","function":"JavaMain"},{"file":"libsystem_pthread.dylib","function":"_pthread_start"},{"file":"libsystem_pthread.dylib","function":"thread_start"}]}},"sig_info":{"si_addr":"0x0000000000000000","si_signo_human_readable":"INVALID","si_signo":0}}

dd-java-agent/agent-crashtracking/src/test/resources/golden/errortracking/sample-crash-for-telemetry.txt

@@ -1 +1 @@
-{"timestamp":"2023-10-17T20:25:14+08:00","ddsource":"crashtracker","error":{"is_crash":true,"kind":"SIGSEGV","message":"Process terminated by signal SIGSEGV","source_type":"crashtracking","stack":{"format":"CrashTrackerV1","frames":[{"file":"libjvm.so","function":"vframeStreamForte::forte_next()"},{"file":"libjvm.so","function":"forte_fill_call_trace_given_top(JavaThread*, ASGCT_CallTrace*, int, frame) [clone .isra.22]"},{"file":"libjvm.so","function":"AsyncGetCallTrace"},{"file":"libjavaProfiler586350205236920700.so","function":"Profiler::getJavaTraceAsync(void*, ASGCT_CallFrame*, int, StackContext*, bool*) [clone .isra.531]"},{"file":"libjavaProfiler586350205236920700.so","function":"Profiler::recordSample(void*, unsigned long long, int, int, Event*)"},{"file":"libjavaProfiler586350205236920700.so","function":"WallClock::sharedSignalHandler(int, siginfo_t*, void*)"},{"file":"libpthread.so.0","function":"libpthread.so.0+0x12cf0"},{"file":"libjvm.so","function":"JfrStackTrace::record_safe(JavaThread*, int)"},{"file":"libjvm.so","function":"JfrStackTraceRepository::record_for_leak_profiler(JavaThread*, int)"},{"file":"libjvm.so","function":"ObjectSampler::sample(HeapWordImpl**, unsigned long, JavaThread*)"},{"file":"libjvm.so","function":"JfrAllocationTracer::JfrAllocationTracer(Klass const*, HeapWordImpl**, unsigned long, bool, JavaThread*)"},{"file":"libjvm.so","function":"AllocTracer::send_allocation_in_new_tlab(Klass*, HeapWordImpl**, unsigned long, unsigned long, JavaThread*)"},{"file":"libjvm.so","function":"MemAllocator::allocate() const"},{"file":"libjvm.so","function":"InstanceKlass::allocate_objArray(int, int, JavaThread*)"},{"file":"libjvm.so","function":"OptoRuntime::new_array_C(Klass*, int, JavaThread*)"}]}},"sig_info":{"si_addr":"0x00007f37a18bc187","si_signo_human_readable":"SIGSEGV","si_signo":11},"os_info":{"architecture":"aarch64","bitness":"64","os_type":"Mac OS X","version":"15.7.1"},"ddtags":"host:COMP-LTD4YC2T2N,runtime-id:edbdef5c-7038-4286-97f8-e76bb65b281f,language:jvm,env:,version:,service:worker.org.gradle.process.internal.worker.GradleWorkerMain,is_crash:true,data_schema_version:1.0,language_name:jvm,language_version:1.8.0_345,tracer_version:1.56.0-snapshot_13a0b2e4c7,uuid:a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3"}
+{"timestamp":"2023-10-17T20:25:14+08:00","ddsource":"crashtracker","error":{"source_type":"crashtracking","is_crash":true,"type":"SIGSEGV","message":"Process terminated by signal SIGSEGV","stack":{"format":"CrashTrackerV1","frames":[{"file":"libjvm.so","function":"vframeStreamForte::forte_next()"},{"file":"libjvm.so","function":"forte_fill_call_trace_given_top(JavaThread*, ASGCT_CallTrace*, int, frame) [clone .isra.22]"},{"file":"libjvm.so","function":"AsyncGetCallTrace"},{"file":"libjavaProfiler586350205236920700.so","function":"Profiler::getJavaTraceAsync(void*, ASGCT_CallFrame*, int, StackContext*, bool*) [clone .isra.531]"},{"file":"libjavaProfiler586350205236920700.so","function":"Profiler::recordSample(void*, unsigned long long, int, int, Event*)"},{"file":"libjavaProfiler586350205236920700.so","function":"WallClock::sharedSignalHandler(int, siginfo_t*, void*)"},{"file":"libpthread.so.0","function":"libpthread.so.0+0x12cf0"},{"file":"libjvm.so","function":"JfrStackTrace::record_safe(JavaThread*, int)"},{"file":"libjvm.so","function":"JfrStackTraceRepository::record_for_leak_profiler(JavaThread*, int)"},{"file":"libjvm.so","function":"ObjectSampler::sample(HeapWordImpl**, unsigned long, JavaThread*)"},{"file":"libjvm.so","function":"JfrAllocationTracer::JfrAllocationTracer(Klass const*, HeapWordImpl**, unsigned long, bool, JavaThread*)"},{"file":"libjvm.so","function":"AllocTracer::send_allocation_in_new_tlab(Klass*, HeapWordImpl**, unsigned long, unsigned long, JavaThread*)"},{"file":"libjvm.so","function":"MemAllocator::allocate() const"},{"file":"libjvm.so","function":"InstanceKlass::allocate_objArray(int, int, JavaThread*)"},{"file":"libjvm.so","function":"OptoRuntime::new_array_C(Klass*, int, JavaThread*)"}]}},"sig_info":{"si_addr":"0x00007f37a18bc187","si_signo_human_readable":"SIGSEGV","si_signo":11}}

dd-java-agent/agent-crashtracking/src/test/resources/golden/errortracking/sample-ping.txt

@@ -1 +1 @@
-{"timestamp":"2025-11-19T13:55:23.532+01:00","ddsource":"crashtracker","error":{"is_crash":false,"message":"Crashtracker crash ping: crash processing started","source_type":"crashtracking"},"os_info":{"architecture":"aarch64","bitness":"64","os_type":"Mac OS X","version":"15.7.1"},"ddtags":"host:COMP-LTD4YC2T2N,runtime-id:3a52cf96-691d-4705-a911-7f89f4d4d9c3,language:jvm,env:,version:,service:worker.org.gradle.process.internal.worker.GradleWorkerMain,is_crash_ping:true,data_schema_version:1.0,language_name:jvm,language_version:1.8.0_345,tracer_version:1.56.0-snapshot_13a0b2e4c7,uuid:a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3"}
+{"timestamp":"2025-11-19T13:55:23.532+01:00","ddsource":"crashtracker","error":{"message":"Crashtracker crash ping: crash processing started","source_type":"crashtracking"},"os_info":{"architecture":"aarch64","bitness":"64","os_type":"Mac OS X","version":"15.7.1"},"ddtags":"host:COMP-LTD4YC2T2N,runtime-id:3a52cf96-691d-4705-a911-7f89f4d4d9c3,language:jvm,env:,version:,service:worker.org.gradle.process.internal.worker.GradleWorkerMain,is_crash_ping:true,data_schema_version:1.0,language_name:jvm,language_version:1.8.0_345,tracer_version:1.56.0-snapshot_13a0b2e4c7,uuid:a4194cd6-8cb3-45fd-9bd9-3af83e0a3ad3"}