feat(crashtracking): Add flag to enable extended info in crash reports

bric3 · bric3 · commit a65abcd55245 · 2026-04-03T16:59:38.000+02:00
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/ConfigManager.java
@@ -35,6 +35,7 @@ public static class StoredConfig {
     final String reportUUID;
     final boolean agentless;
     final boolean sendToErrorTracking;
+    final boolean extendedInfoEnabled;
 
     StoredConfig(
         String reportUUID,
@@ -45,7 +46,8 @@ public static class StoredConfig {
         String processTags,
         String runtimeId,
         boolean agentless,
-        boolean sendToErrorTracking) {
+        boolean sendToErrorTracking,
+        boolean extendedInfoEnabled) {
       this.service = service;
       this.env = env;
       this.version = version;
@@ -55,6 +57,11 @@ public static class StoredConfig {
       this.reportUUID = reportUUID;
       this.agentless = agentless;
       this.sendToErrorTracking = sendToErrorTracking;
+      this.extendedInfoEnabled = extendedInfoEnabled;
+    }
+
+    public CrashUploaderSettings toCrashUploaderSettings() {
+      return new CrashUploaderSettings(extendedInfoEnabled);
     }
 
     public static class Builder {
@@ -67,6 +74,7 @@ public static class Builder {
       String reportUUID;
       boolean agentless;
       boolean sendToErrorTracking;
+      boolean extendedInfoEnabled;
 
       public Builder(Config config) {
         // get sane defaults
@@ -77,6 +85,7 @@ public Builder(Config config) {
         this.reportUUID = RandomUtils.randomUUID().toString();
         this.agentless = config.isCrashTrackingAgentless();
         this.sendToErrorTracking = config.isCrashTrackingErrorsIntakeEnabled();
+        this.extendedInfoEnabled = config.isCrashTrackingExtendedInfoEnabled();
       }
 
       public Builder service(String service) {
@@ -119,6 +128,11 @@ public Builder agentless(boolean agentless) {
         return this;
       }
 
+      public Builder extendedInfoEnabled(boolean extendedInfoEnabled) {
+        this.extendedInfoEnabled = extendedInfoEnabled;
+        return this;
+      }
+
       // @VisibleForTesting
       Builder reportUUID(String reportUUID) {
         this.reportUUID = reportUUID;
@@ -135,7 +149,8 @@ public StoredConfig build() {
             processTags,
             runtimeId,
             agentless,
-            sendToErrorTracking);
+            sendToErrorTracking,
+            extendedInfoEnabled);
       }
     }
   }
@@ -194,6 +209,8 @@ static void writeConfigToFile(Config config, Path cfgPath, String... additionalE
       writeEntry(bw, "java_home", SystemProperties.get("java.home"));
       writeEntry(bw, "agentless", Boolean.toString(config.isCrashTrackingAgentless()));
       writeEntry(bw, "upload_to_et", Boolean.toString(config.isCrashTrackingErrorsIntakeEnabled()));
+      writeEntry(
+          bw, "extended_info", Boolean.toString(config.isCrashTrackingExtendedInfoEnabled()));
 
       Runtime.getRuntime()
           .addShutdownHook(
@@ -257,6 +274,9 @@ public static StoredConfig readConfig(Config config, Path scriptPath) {
           case "upload_to_et":
             cfgBuilder.sendToErrorTracking(Boolean.parseBoolean(value));
             break;
+          case "extended_info":
+            cfgBuilder.extendedInfoEnabled(Boolean.parseBoolean(value));
+            break;
           default:
             // ignore
             break;
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java
@@ -113,6 +113,7 @@ public void onResponse(Call call, Response response) throws IOException {
 
   private final Config config;
   private final ConfigManager.StoredConfig storedConfig;
+  private final CrashUploaderSettings uploaderSettings;
 
   private final HttpUrl telemetryUrl;
   private final HttpUrl errorTrackingUrl;
@@ -131,6 +132,7 @@ public CrashUploader(@Nonnull final ConfigManager.StoredConfig storedConfig) {
       @NonNull final Config config, @Nonnull final ConfigManager.StoredConfig storedConfig) {
     this.config = config;
     this.storedConfig = storedConfig;
+    this.uploaderSettings = storedConfig.toCrashUploaderSettings();
     this.telemetryUrl = HttpUrl.get(config.getFinalCrashTrackingTelemetryUrl());
     this.errorTrackingUrl = HttpUrl.get(config.getFinalCrashTrackingErrorTrackingUrl());
     this.agentless = config.isCrashTrackingAgentless();
@@ -525,7 +527,7 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool
           }
           writer.name("type").value(payload.error.kind);
           writer.name("message").value(payload.error.message);
-          if (payload.error.threadName != null) {
+          if (uploaderSettings.isExtendedInfoEnabled() && payload.error.threadName != null) {
             writer.name("thread_name").value(payload.error.threadName);
           }
           writer.name("source_type").value("Crashtracking");
@@ -588,7 +590,8 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool
             }
             writer.endObject();
           }
-          if (payload.experimental.runtimeArgs != null) {
+          if (uploaderSettings.isExtendedInfoEnabled()
+              && payload.experimental.runtimeArgs != null) {
             writer.name("runtime_args");
             writer.beginArray();
             for (String arg : payload.experimental.runtimeArgs) {
@@ -599,7 +602,7 @@ private RequestBody makeErrorTrackingRequestBody(@Nonnull CrashLog payload, bool
           writer.endObject();
         }
         // files (e.g. /proc/self/maps or dynamic_libraries)
-        if (payload.files != null) {
+        if (uploaderSettings.isExtendedInfoEnabled() && payload.files != null) {
           writer.name("files");
           writer.beginObject();
           writer.name(payload.files.name);
diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploaderSettings.java
@@ -0,0 +1,14 @@
+package datadog.crashtracking;
+
+/** Immutable settings that control what data {@link CrashUploader} includes in uploaded reports. */
+public final class CrashUploaderSettings {
+  final boolean extendedInfoEnabled;
+
+  CrashUploaderSettings(boolean extendedInfoEnabled) {
+    this.extendedInfoEnabled = extendedInfoEnabled;
+  }
+
+  boolean isExtendedInfoEnabled() {
+    return extendedInfoEnabled;
+  }
+}
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/ConfigManagerTest.java
@@ -24,6 +24,7 @@ public void testConfigWriteAndRead() throws IOException {
         .thenReturn(new WellKnownTags("1234", "", "env", "service", "version", ""));
     when(config.isCrashTrackingAgentless()).thenReturn(false);
     when(config.isCrashTrackingErrorsIntakeEnabled()).thenReturn(true);
+    when(config.isCrashTrackingExtendedInfoEnabled()).thenReturn(true);
     when(config.getMergedCrashTrackingTags()).thenReturn(Collections.singletonMap("key", "value"));
     File tmpFile = File.createTempFile("ConfigManagerTest", null);
     tmpFile.deleteOnExit();
@@ -41,6 +42,7 @@ public void testConfigWriteAndRead() throws IOException {
         deserialized.processTags);
     assertFalse(deserialized.agentless);
     assertTrue(deserialized.sendToErrorTracking);
+    assertTrue(deserialized.extendedInfoEnabled);
   }
 
   @Test
@@ -56,5 +58,6 @@ public void testStoredConfigDefaults() {
     assertEquals("env", storedConfig.env);
     assertFalse(storedConfig.agentless);
     assertFalse(storedConfig.sendToErrorTracking);
+    assertFalse(storedConfig.extendedInfoEnabled);
   }
 }
diff --git a/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java b/dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java
@@ -323,6 +323,7 @@ public void testErrorTrackingHappyPath(String log) throws Exception {
             .processTags("a:b")
             .runtimeId("1234")
             .tags(ConfigManager.getMergedTagsForSerialization(Config.get())) // take the real ones
+            .extendedInfoEnabled(true)
             .build();
     // When
     uploader = new CrashUploader(config, crashConfig);
@@ -362,6 +363,28 @@ public void testErrorTrackingHappyPath(String log) throws Exception {
         .isEqualTo(mapper.writeValueAsString(expected));
   }
 
+  @Test
+  public void testErrorTrackingExcludesExtendedInfoByDefault() throws Exception {
+    // extendedInfoEnabled defaults to false — files, thread_name and runtime_args must not appear
+    ConfigManager.StoredConfig crashConfig =
+        new ConfigManager.StoredConfig.Builder(config)
+            .reportUUID(SAMPLE_UUID)
+            .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+            .build();
+
+    uploader = new CrashUploader(config, crashConfig);
+    server.enqueue(new MockResponse().setResponseCode(200));
+    uploader.remoteUpload(readFileAsString("sample-crash-for-telemetry.txt"), false, true);
+
+    final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
+    final ObjectMapper mapper = new ObjectMapper();
+    final JsonNode event = mapper.readTree(recordedRequest.getBody().readUtf8());
+
+    assertNull(event.get("files"));
+    assertNull(event.at("/error/thread_name").textValue());
+    assertTrue(event.at("/experimental/runtime_args").isMissingNode());
+  }
+
   @Test
   public void testErrorTrackingSerializesRuntimeArgs() throws Exception {
     ConfigManager.StoredConfig crashConfig =
@@ -370,6 +393,7 @@ public void testErrorTrackingSerializesRuntimeArgs() throws Exception {
             .processTags("a:b")
             .runtimeId("1234")
             .tags(ConfigManager.getMergedTagsForSerialization(Config.get()))
+            .extendedInfoEnabled(true)
             .build();
 
     uploader = new CrashUploader(config, crashConfig);
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java
@@ -28,6 +28,10 @@ public final class CrashTrackingConfig {
       "crashtracking.errors-intake.enabled";
   public static final boolean CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT = false;
 
+  public static final String CRASH_TRACKING_EXTENDED_INFO_ENABLED =
+      "crashtracking.extended-info.enabled";
+  public static final boolean CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT = false;
+
   public static final String CRASH_TRACKING_START_EARLY = "crashtracking.debug.start-force-first";
   public static final boolean CRASH_TRACKING_START_EARLY_DEFAULT = false;
 
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -298,6 +298,8 @@
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS_DEFAULT;
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_ERRORS_INTAKE_ENABLED;
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT;
+import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_EXTENDED_INFO_ENABLED;
+import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT;
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_TAGS;
 import static datadog.trace.api.config.CwsConfig.CWS_ENABLED;
 import static datadog.trace.api.config.CwsConfig.CWS_TLS_REFRESH;
@@ -1003,6 +1005,7 @@ public static String getHostName() {
   private final boolean crashTrackingAgentless;
   private final Map<String, String> crashTrackingTags;
   private final boolean crashTrackingErrorsIntakeEnabled;
+  private final boolean crashTrackingExtendedInfoEnabled;
 
   private final boolean clientIpEnabled;
 
@@ -2220,6 +2223,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     crashTrackingErrorsIntakeEnabled =
         configProvider.getBoolean(
             CRASH_TRACKING_ERRORS_INTAKE_ENABLED, CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT);
+    crashTrackingExtendedInfoEnabled =
+        configProvider.getBoolean(
+            CRASH_TRACKING_EXTENDED_INFO_ENABLED, CRASH_TRACKING_EXTENDED_INFO_ENABLED_DEFAULT);
 
     float telemetryInterval =
         configProvider.getFloat(TELEMETRY_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL);
@@ -3813,6 +3819,10 @@ public boolean isCrashTrackingErrorsIntakeEnabled() {
     return crashTrackingErrorsIntakeEnabled;
   }
 
+  public boolean isCrashTrackingExtendedInfoEnabled() {
+    return crashTrackingExtendedInfoEnabled;
+  }
+
   public boolean isTelemetryEnabled() {
     return instrumenterConfig.isTelemetryEnabled();
   }
@@ -6122,6 +6132,8 @@ public String toString() {
         + crashTrackingAgentless
         + ", crashTrackingErrorsIntakeEnabled="
         + crashTrackingErrorsIntakeEnabled
+        + ", crashTrackingExtendedInfoEnabled="
+        + crashTrackingExtendedInfoEnabled
         + ", remoteConfigEnabled="
         + remoteConfigEnabled
         + ", remoteConfigUrl="
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
@@ -953,6 +953,14 @@
         "aliases": []
       }
     ],
+    "DD_CRASHTRACKING_EXTENDED_INFO_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "false",
+        "aliases": []
+      }
+    ],
     "DD_CRASHTRACKING_PROXY_HOST": [
       {
         "version": "A",
