Skip to content

Bump async-profiler to 2.7-DD-20220303 #3423

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

Merged
luhenry merged 2 commits into from
Mar 3, 2022
Merged

Bump async-profiler to 2.7-DD-20220303 #3423

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
c07a44a
Set default async-profiler set mode to 12
luhenry Mar 1, 2022
1cd9252
Bump async-profiler to 2.7-DD-20220303
luhenry Mar 3, 2022
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
10 changes: 9 additions & 1 deletion ...ary-async/src/main/java/com/datadog/profiling/auxiliary/async/AuxiliaryAsyncProfiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
.append(getCpuInterval())
.append('m')
.append(",jstackdepth=")
.append(getStackDepth());
.append(getStackDepth())
.append(",safemode=")
.append(getSafeMode());
}
if (profilingModes.contains(ProfilingMode.ALLOCATION)) {
// allocation profiling is enabled
Expand Down Expand Up @@ -311,6 +313,12 @@ private int getStackDepth() {
ProfilingConfig.PROFILING_ASYNC_CPU_STACKDEPTH_DEFAULT);
}

private int getSafeMode() {
return configProvider.getInteger(
ProfilingConfig.PROFILING_ASYNC_CPU_SAFEMODE,
ProfilingConfig.PROFILING_ASYNC_CPU_SAFEMODE_DEFAULT);
}

private String getCpuMode() {
return configProvider.getString(
ProfilingConfig.PROFILING_ASYNC_CPU_MODE, ProfilingConfig.PROFILING_ASYNC_CPU_MODE_DEFAULT);
Expand Down
2 changes: 2 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 @@ -72,6 +72,8 @@ public final class ProfilingConfig {
public static final int PROFILING_ASYNC_CPU_INTERVAL_DEFAULT = 10;
public static final String PROFILING_ASYNC_CPU_STACKDEPTH = "profiling.async.cpu.stackdepth";
public static final int PROFILING_ASYNC_CPU_STACKDEPTH_DEFAULT = 512;
public static final String PROFILING_ASYNC_CPU_SAFEMODE = "profiling.async.cpu.safemode";
public static final int PROFILING_ASYNC_CPU_SAFEMODE_DEFAULT = 12; // POP_FRAME|SCAN_STACK
public static final String PROFILING_ASYNC_MEMLEAK_ENABLED = "profiling.async.memleak.enabled";
public static final boolean PROFILING_ASYNC_MEMLEAK_ENABLED_DEFAULT = false;
public static final String PROFILING_ASYNC_MEMLEAK_INTERVAL = "profiling.async.memleak.interval";
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 @@ -29,7 +29,7 @@ final class CachedData {
testcontainers: '1.15.0-rc2',
jmc : "8.1.0-SNAPSHOT",
autoservice : "1.0-rc7",
asyncprofiler : "2.6-DD-20220212"
asyncprofiler : "2.7-DD-20220303"
]

static deps = [
Expand Down