Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable queue time tracing by default #6833

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Enable queue time tracing by default #6833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-agent/instrumentation/java-concurrent/src/test/groovy/ExecutorInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion ...ava-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/netty-concurrent-4/src/test/groovy/TimingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
4 changes: 2 additions & 2 deletions ...g-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Comment on lines -191 to +195
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note - this will have to have a release note just in case there are some customer actually using the experimental config.


public static final long PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT = 50;

Expand Down