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

Add configuration parameter for GC generation count tracking #7210

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Add configuration parameter for GC generation count tracking #7210

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
11a32be
Add configuration parameter for GC generation count tracking
jbachorik May 14, 2024
7466278
Update ddprof to 1.8.0
jbachorik Jun 18, 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
2 changes: 2 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 @@ -18,6 +18,7 @@
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isMemoryLeakProfilingEnabled;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isResourceNameContextAttributeEnabled;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isSpanNameContextAttributeEnabled;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isTrackingGenerations;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isWallClockProfilerEnabled;
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.omitLineNumbers;
import static com.datadog.profiling.utils.ProfilingMode.ALLOCATION;
Expand Down Expand Up @@ -240,6 +241,7 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
cmd.append(",cstack=").append(getCStack(configProvider));
cmd.append(",safemode=").append(getSafeMode(configProvider));
cmd.append(",attributes=").append(String.join(";", orderedContextAttributes));
cmd.append(",generations=").append(isTrackingGenerations(configProvider));
if (omitLineNumbers(configProvider)) {
cmd.append(",linenumbers=f");
}
Expand Down
7 changes: 7 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 @@ -41,6 +41,8 @@
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED_DEFAULT;
import static datadog.trace.api.config.ProfilingConfig.PROFILING_STACKDEPTH;
Expand Down Expand Up @@ -355,6 +357,11 @@ public static boolean isResourceNameContextAttributeEnabled(ConfigProvider confi
return configProvider.getBoolean(PROFILING_CONTEXT_ATTRIBUTES_RESOURCE_NAME_ENABLED, false);
}

public static boolean isTrackingGenerations(ConfigProvider configProvider) {
return getBoolean(
configProvider, PROFILING_HEAP_TRACK_GENERATIONS, PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT);
}

public static String getString(ConfigProvider configProvider, String key, String defaultValue) {
return configProvider.getString(key, configProvider.getString(normalizeKey(key), defaultValue));
}
Expand Down
3 changes: 3 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 @@ -211,6 +211,9 @@ public final class ProfilingConfig {
public static final String PROFILING_HEAP_HISTOGRAM_MODE = "profiling.heap.histogram.mode";
public static final String PROFILING_HEAP_HISTOGRAM_MODE_DEFAULT = "aftergc";

public static final String PROFILING_HEAP_TRACK_GENERATIONS = "profiling.heap.track.generations";
public static final boolean PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT = false;

public static final String PROFILING_TIMELINE_EVENTS_ENABLED =
"profiling.timeline.events.enabled";
public static final boolean PROFILING_TIMELINE_EVENTS_ENABLED_DEFAULT = false;
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class CachedData {
testcontainers: '1.19.3',
jmc : "8.1.0",
autoservice : "1.0-rc7",
ddprof : "1.7.0",
ddprof : "1.8.0",
asm : "9.7",
cafe_crypto : "0.1.0",
lz4 : "1.7.1"
Expand Down
Loading