Skip to content

Commit 270a82d

Browse files
author
Matt
authored
Standardize some of the profiler sampling frequencies (#7961)
* Standardize some of the profiler sampling frequencies * Allow override of 50ms J9 CPU default * Touchups
1 parent f4163fa commit 270a82d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.datadog.profiling.utils.ProfilingMode;
3737
import com.datadoghq.profiler.ContextSetter;
3838
import com.datadoghq.profiler.JavaProfiler;
39+
import datadog.trace.api.Platform;
3940
import datadog.trace.api.config.ProfilingConfig;
4041
import datadog.trace.api.profiling.RecordingData;
4142
import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -268,7 +269,13 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
268269
}
269270
} else {
270271
// using cpu time schedule
271-
cmd.append(",cpu=").append(getCpuInterval(configProvider)).append('m');
272+
int interval = getCpuInterval();
273+
if (Platform.isJ9())
274+
interval =
275+
interval == ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT
276+
? ProfilingConfig.PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT
277+
: interval;
278+
cmd.append(",cpu=").append(interval).append('m');
272279
}
273280
}
274281
if (profilingModes.contains(WALL)) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ public final class ProfilingConfig {
106106
public static final boolean PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT = true;
107107
public static final String PROFILING_DATADOG_PROFILER_WALL_INTERVAL =
108108
"profiling.ddprof.wall.interval.ms";
109-
public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 10;
109+
public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 50;
110+
111+
public static final int PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT = 50;
110112

111113
public static final String PROFILING_DATADOG_PROFILER_WALL_COLLAPSING =
112114
"profiling.ddprof.wall.collapsing";

0 commit comments

Comments
 (0)