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

Allow subsampling the liveheap profiling data #7380

Merged
merged 2 commits into from
Aug 13, 2024
Merged

Allow subsampling the liveheap profiling data #7380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8867b96
Add configuration option for liveheap subsampling
jbachorik Aug 2, 2024
060e520
Merge branch 'master' into jb/liveheap_subsample
jbachorik Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...rofiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getCStack;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getContextAttributes;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getCpuInterval;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getLiveHeapSamplePercent;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getLogLevel;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getSafeMode;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.getSchedulingEvent;
Expand Down Expand Up @@ -281,6 +282,8 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
}
if (profilingModes.contains(MEMLEAK)) {
cmd.append(isLiveHeapSizeTrackingEnabled(configProvider) ? 'L' : 'l');
cmd.append(':')
.append(String.format("%.2f", getLiveHeapSamplePercent(configProvider) / 100.0d));
}
}
String cmdString = cmd.toString();
Expand Down
9 changes: 9 additions & 0 deletions ...ng/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED_DEFAULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_INTERVAL;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_LOG_LEVEL;
Expand Down Expand Up @@ -224,6 +226,13 @@ public static boolean isLiveHeapSizeTrackingEnabled(ConfigProvider configProvide
PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT);
}

public static int getLiveHeapSamplePercent(ConfigProvider configProvider) {
return getInteger(
configProvider,
PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT,
PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT);
}

public static long getMemleakInterval(ConfigProvider configProvider) {
long maxheap = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax();
long memleakIntervalDefault =
Expand Down
5 changes: 5 additions & 0 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 @@ -162,6 +162,11 @@ public final class ProfilingConfig {
public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE =
"profiling.ddprof.liveheap.track_size.enabled";
public static final boolean PROFILING_DATADOG_PROFILER_LIVEHEAP_TRACK_HEAPSIZE_DEFAFULT = true;
public static final String PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT =
"profiling.ddprof.liveheap.sample_percent";
public static final int PROFILING_DATADOG_PROFILER_LIVEHEAP_SAMPLE_PERCENT_DEFAULT =
50; // default to 10% of allocation samples

public static final String PROFILING_ENDPOINT_COLLECTION_ENABLED =
"profiling.endpoint.collection.enabled";
public static final boolean PROFILING_ENDPOINT_COLLECTION_ENABLED_DEFAULT = true;
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ moshi = '1.11.0'
testcontainers = '1.19.3'
jmc = "8.1.0"
autoservice = "1.0-rc7"
ddprof = "1.9.0"
ddprof = "1.12.0"
asm = "9.7"
cafe_crypto = "0.1.0"
lz4 = "1.7.1"
Expand Down
Loading