Make error intake upload optin

Author: amarziali

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

@@ -243,7 +243,7 @@ public void upload(@Nonnull Path file) {
       log.error("Unable to print the error crash as a log message", t);
     }
     try {
-      remoteUpload(fileContent, true, true);
+      remoteUpload(fileContent, true, config.isCrashTrackingErrorsIntakeEnabled());
     } finally {
       uploadClient.dispatcher().cancelAll();
     }

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

@@ -257,7 +257,7 @@ public void testTelemetryHappyPath(String log) throws Exception {
     // When
     uploader = new CrashUploader(config, crashConfig);
     server.enqueue(new MockResponse().setResponseCode(200));
-    uploader.remoteUpload(readFileAsString(log), true, false);
+    uploader.upload(getResourcePath(log));
 
     final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
 

dd-trace-api/src/main/java/datadog/trace/api/config/CrashTrackingConfig.java

@@ -24,6 +24,10 @@ public final class CrashTrackingConfig {
   public static final String CRASH_TRACKING_AGENTLESS = "crashtracking.agentless";
   public static final boolean CRASH_TRACKING_AGENTLESS_DEFAULT = false;
 
+  public static final String CRASH_TRACKING_ERRORS_INTAKE_ENABLED =
+      "crashtracking.errors-intake.enabled";
+  public static final boolean CRASH_TRACKING_ERRORS_INTAKE_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;
 

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -299,6 +299,8 @@
 import static datadog.trace.api.config.CiVisibilityConfig.TEST_SESSION_NAME;
 import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS;
 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_TAGS;
 import static datadog.trace.api.config.CwsConfig.CWS_ENABLED;
 import static datadog.trace.api.config.CwsConfig.CWS_TLS_REFRESH;
@@ -976,6 +978,7 @@ public static String getHostName() {
 
   private final boolean crashTrackingAgentless;
   private final Map<String, String> crashTrackingTags;
+  private final boolean crashTrackingErrorsIntakeEnabled;
 
   private final boolean clientIpEnabled;
 
@@ -2123,6 +2126,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     crashTrackingAgentless =
         configProvider.getBoolean(CRASH_TRACKING_AGENTLESS, CRASH_TRACKING_AGENTLESS_DEFAULT);
     crashTrackingTags = configProvider.getMergedMap(CRASH_TRACKING_TAGS);
+    crashTrackingErrorsIntakeEnabled =
+        configProvider.getBoolean(
+            CRASH_TRACKING_ERRORS_INTAKE_ENABLED, CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT);
 
     float telemetryInterval =
         configProvider.getFloat(TELEMETRY_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL);
@@ -3690,6 +3696,10 @@ public boolean isCrashTrackingAgentless() {
     return crashTrackingAgentless;
   }
 
+  public boolean isCrashTrackingErrorsIntakeEnabled() {
+    return crashTrackingErrorsIntakeEnabled;
+  }
+
   public boolean isTelemetryEnabled() {
     return instrumenterConfig.isTelemetryEnabled();
   }
@@ -5897,6 +5907,8 @@ public String toString() {
         + crashTrackingTags
         + ", crashTrackingAgentless="
         + crashTrackingAgentless
+        + ", crashTrackingErrorsIntakeEnabled="
+        + crashTrackingErrorsIntakeEnabled
         + ", remoteConfigEnabled="
         + remoteConfigEnabled
         + ", remoteConfigUrl="

metadata/supported-configurations.json

@@ -124,6 +124,7 @@
     "DD_CRASHTRACKING_DEBUG_AUTOCONFIG_ENABLE": ["A"],
     "DD_CRASHTRACKING_DEBUG_START_FORCE_FIRST": ["A"],
     "DD_CRASHTRACKING_ENABLED": ["A"],
+    "DD_CRASHTRACKING_ERRORS_INTAKE_ENABLED": ["A"],
     "DD_CRASHTRACKING_PROXY_HOST": ["A"],
     "DD_CRASHTRACKING_PROXY_PASSWORD": ["A"],
     "DD_CRASHTRACKING_PROXY_PORT": ["A"],