Skip to content

Commit f4fa29a

Browse files
zhengyu123devflow.devflow-routing-intake
andauthored
Remove experimental jvmti wallclock profiler (#10872)
Remove experimental jvmti wallclock profiler Merge branch 'master' into zgu/rm-experiment-wall-jvmti Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 9f2354e commit f4fa29a

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilerFlareReporter.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,6 @@ private String getProfilerConfig() {
345345
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER,
346346
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT),
347347
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT);
348-
appendConfig(
349-
sb,
350-
"DDProf Wall JVMTI",
351-
configProvider.getBoolean(
352-
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI,
353-
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT),
354-
ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT);
355-
356348
sb.append("\n=== DDProf Allocation Profiling ===\n");
357349
appendConfig(
358350
sb,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isTrackingGenerations;
2323
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.isWallClockProfilerEnabled;
2424
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.omitLineNumbers;
25-
import static com.datadog.profiling.ddprof.DatadogProfilerConfig.useJvmtiWallclockSampler;
2625
import static com.datadog.profiling.utils.ProfilingMode.ALLOCATION;
2726
import static com.datadog.profiling.utils.ProfilingMode.CPU;
2827
import static com.datadog.profiling.utils.ProfilingMode.MEMLEAK;
@@ -313,9 +312,6 @@ String cmdStartProfiling(Path file) throws IllegalStateException {
313312
} else {
314313
cmd.append(",filter=");
315314
}
316-
if (useJvmtiWallclockSampler(configProvider)) {
317-
cmd.append(",wallsampler=jvmti");
318-
}
319315
}
320316
cmd.append(",loglevel=").append(getLogLevel(configProvider));
321317
if (profilingModes.contains(ALLOCATION) || profilingModes.contains(MEMLEAK)) {

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED;
4444
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL;
4545
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT;
46-
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI;
47-
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT;
4846
import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS;
4947
import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_TRACK_GENERATIONS_DEFAULT;
5048
import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED;
@@ -440,13 +438,6 @@ public static long getLong(ConfigProvider configProvider, String key) {
440438
return configProvider.getLong(key, configProvider.getLong(normalizeKey(key), -1));
441439
}
442440

443-
public static boolean useJvmtiWallclockSampler(ConfigProvider configProvider) {
444-
return getBoolean(
445-
configProvider,
446-
PROFILING_DATADOG_PROFILER_WALL_JVMTI,
447-
PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT);
448-
}
449-
450441
private static String normalizeKey(String key) {
451442
return key.replace(".ddprof.", ".async.");
452443
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ public final class ProfilingConfig {
119119
"profiling.ddprof.wall.context.filter";
120120
public static final boolean PROFILING_DATADOG_PROFILER_WALL_CONTEXT_FILTER_DEFAULT = true;
121121

122-
public static final String PROFILING_DATADOG_PROFILER_WALL_JVMTI =
123-
"profiling.experimental.ddprof.wall.jvmti";
124-
public static final boolean PROFILING_DATADOG_PROFILER_WALL_JVMTI_DEFAULT = false;
125-
126122
public static final String PROFILING_DATADOG_PROFILER_SCHEDULING_EVENT =
127123
"profiling.experimental.ddprof.scheduling.event";
128124

0 commit comments

Comments
 (0)