Enable queue time tracing by default (#6833)

DataDog · Mar 21, 2024 · 78b3d6c · 78b3d6c
1 parent 45ff2b9
commit 78b3d6c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/...-agent/instrumentation/java-concurrent/src/test/groovy/ExecutorInstrumentationTest.groovy b/...-agent/instrumentation/java-concurrent/src/test/groovy/ExecutorInstrumentationTest.groovy
@@ -505,6 +505,6 @@ class ExecutorInstrumentationLegacyForkedTest extends ExecutorInstrumentationTes
 class ExecutorInstrumentationQueueTimeForkedTest extends ExecutorInstrumentationTest {
   def setupSpec() {
     System.setProperty("dd.profiling.enabled", "true")
-    System.setProperty("dd.profiling.experimental.queueing.time.enabled", "true")
+    System.setProperty("dd.profiling.queueing.time.enabled", "true")
   }
 }
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy
@@ -12,7 +12,7 @@ class QueueTimingForkedTest extends AgentTestRunner {
   protected void configurePreAgent() {
     // required for enabling the unwrapping instrumentation to get the relevant non-carrier class names
     injectSysConfig("dd.profiling.enabled", "true")
-    injectSysConfig("dd.profiling.experimental.queueing.time.enabled", "true")
+    injectSysConfig("dd.profiling.queueing.time.enabled", "true")
     InstrumentationBasedProfiling.enableInstrumentationBasedProfiling()
     super.configurePreAgent()
   }

diff --git a/...ava-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy b/...ava-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy
@@ -10,7 +10,7 @@ class TaskUnwrappingForkedTest extends AgentTestRunner {
   @Override
   protected void configurePreAgent() {
     injectSysConfig("dd.profiling.enabled", "true")
-    injectSysConfig("dd.profiling.experimental.queueing.time.enabled", "true")
+    injectSysConfig("dd.profiling.queueing.time.enabled", "true")
     super.configurePreAgent()
   }
 

diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/src/test/groovy/TimingTest.groovy b/dd-java-agent/instrumentation/netty-concurrent-4/src/test/groovy/TimingTest.groovy
@@ -12,7 +12,7 @@ class TimingTest extends AgentTestRunner {
   @Override
   protected void configurePreAgent() {
     injectSysConfig("dd.profiling.enabled", "true")
-    injectSysConfig("dd.profiling.experimental.queueing.time.enabled", "true")
+    injectSysConfig("dd.profiling.queueing.time.enabled", "true")
     InstrumentationBasedProfiling.enableInstrumentationBasedProfiling()
     super.configurePreAgent()
   }

diff --git a/...g-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java b/...g-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
@@ -763,8 +763,8 @@ private static ProcessBuilder createProcessBuilder(
             "-Ddd.profiling.endpoint.collection.enabled=" + endpointCollectionEnabled,
             "-Ddd.profiling.upload.timeout=" + PROFILING_UPLOAD_TIMEOUT_SECONDS,
             "-Ddd.profiling.debug.dump_path=/tmp/dd-profiler",
-            "-Ddd.profiling.experimental.queueing.time.enabled=true",
-            "-Ddd.profiling.experimental.queueing.time.threshold.millis=0",
+            "-Ddd.profiling.queueing.time.enabled=true",
+            "-Ddd.profiling.queueing.time.threshold.millis=0",
             "-Ddd.profiling.experimental.jmethodid_cache.enabled=" + jmethodIdCacheEnabled,
             "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug",
             "-Ddd.profiling.context.attributes=foo,bar",

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
@@ -187,13 +187,12 @@ public final class ProfilingConfig {
   public static final String PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED =
       "profiling.context.attributes.resource.name.enabled";
 
-  public static final String PROFILING_QUEUEING_TIME_ENABLED =
-      "profiling.experimental.queueing.time.enabled";
+  public static final String PROFILING_QUEUEING_TIME_ENABLED = "profiling.queueing.time.enabled";
 
-  public static final boolean PROFILING_QUEUEING_TIME_ENABLED_DEFAULT = false;
+  public static final boolean PROFILING_QUEUEING_TIME_ENABLED_DEFAULT = true;
 
   public static final String PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS =
-      "profiling.experimental.queueing.time.threshold.millis";
+      "profiling.queueing.time.threshold.millis";
 
   public static final long PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT = 50;