Allow soft-rollout with crashtracking auto-config only if ddprof-java is enabled

Author: jbachorik

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -40,7 +40,6 @@
 import datadog.trace.api.profiling.ProfilingEnablement;
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.benchmark.StaticEventLogger;
-import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.bootstrap.config.provider.StableConfigSource;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI;
@@ -1052,10 +1051,20 @@ private static void initializeCrashTrackingDefault() {
   }
 
   private static boolean isCrashTrackingAutoconfigEnabled() {
-    return !ConfigProvider.getInstance()
-        .getBoolean(
-            CrashTrackingConfig.CRASH_TRACKING_DISABLE_AUTOCONFIG,
-            CrashTrackingConfig.CRASH_TRACKING_DISABLE_AUTOCONFIG_DEFAULT);
+    String enabledVal = ddGetProperty("dd." + CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG);
+    boolean enabled = CrashTrackingConfig.CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT;
+    if (enabledVal != null) {
+      enabled = Boolean.parseBoolean(enabledVal);
+    } else {
+      // If the property is not set, then we check if ddprof-java profiling is enabled,
+      // because crash tracking autoconfig can safely be enabled by default when
+      // ddprof-java profiling is enabled
+      String ddprofEnabledVal = ddGetProperty("dd.profiling.ddprof.enabled");
+      if (Boolean.parseBoolean(ddprofEnabledVal)) {
+        enabled = true;
+      }
+    }
+    return enabled;
   }
 
   private static void initializeCrashTracking(boolean delayed, boolean checkNative) {

dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java

@@ -180,7 +180,9 @@ void testCrashTracking() throws Exception {
     String onErrorArg =
         !Platform.isLinux()
             ? "-XX:OnError=" + onErrorValue
-            : ""; // on Linux we can automatically inject the arg
+            : "-Ddd.crashtracking.debug.autoconfig.enabled=true"; // on Linux we can automatically
+    // inject the arg but we need to
+    // enable it
     List<String> processArgs = new ArrayList<>();
     processArgs.add(javaPath());
     processArgs.add("-javaagent:" + agentShadowJar());
@@ -256,7 +258,9 @@ void testOomeTracking() throws Exception {
     String onOOMEArg =
         !Platform.isLinux()
             ? "-XX:OnOutOfMemoryError=" + onErrorValue
-            : ""; // on Linux we can automatically inject the arg
+            : "-Ddd.crashtracking.debug.autoconfig.enabled=true"; // on Linux we can automatically
+    // inject the arg but we need to
+    // enable it
 
     List<String> processArgs = new ArrayList<>();
     processArgs.add(javaPath());

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

@@ -27,9 +27,9 @@ public final class CrashTrackingConfig {
   public static final String CRASH_TRACKING_START_EARLY = "crashtracking.debug.start-force-first";
   public static final boolean CRASH_TRACKING_START_EARLY_DEFAULT = false;
 
-  public static final String CRASH_TRACKING_DISABLE_AUTOCONFIG =
-      "crashtracking.debug.autoconfig.disable";
-  public static final boolean CRASH_TRACKING_DISABLE_AUTOCONFIG_DEFAULT = false;
+  public static final String CRASH_TRACKING_ENABLE_AUTOCONFIG =
+      "crashtracking.debug.autoconfig.enabled";
+  public static final boolean CRASH_TRACKING_ENABLE_AUTOCONFIG_DEFAULT = false;
 
   private CrashTrackingConfig() {}
 }