Skip to content

Commit 3ead772

Browse files
committed
Rename PROFILING_WALL_ENABLED -> PROFILING_WALLTIME_ENABLED
1 parent 8c09716 commit 3ead772

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static datadog.trace.api.config.ProfilingConfig.PROFILING_LOCK_ENABLED;
1515
import static datadog.trace.api.config.ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE;
1616
import static datadog.trace.api.config.ProfilingConfig.PROFILING_THREAD_ENABLED;
17-
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALL_ENABLED;
17+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALLTIME_ENABLED;
1818
import static org.junit.jupiter.api.Assertions.assertEquals;
1919
import static org.junit.jupiter.api.Assertions.assertFalse;
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -379,7 +379,7 @@ public void testThreadGateDisablesThreadEvents() throws Exception {
379379
@Test
380380
public void testWallGateDoesNotDisableTimelineEvents() throws Exception {
381381
Properties props = getConfigProperties();
382-
props.put(PROFILING_WALL_ENABLED, "false");
382+
props.put(PROFILING_WALLTIME_ENABLED, "false");
383383

384384
ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
385385
OpenJdkController controller = new OpenJdkController(configProvider);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ private String getProfilerConfig() {
147147
sb,
148148
"Wall Profiling Enabled",
149149
configProvider.getBoolean(
150-
ProfilingConfig.PROFILING_WALL_ENABLED, ProfilingConfig.PROFILING_WALL_ENABLED_DEFAULT),
151-
ProfilingConfig.PROFILING_WALL_ENABLED_DEFAULT);
150+
ProfilingConfig.PROFILING_WALLTIME_ENABLED, ProfilingConfig.PROFILING_WALLTIME_ENABLED_DEFAULT),
151+
ProfilingConfig.PROFILING_WALLTIME_ENABLED_DEFAULT);
152152
appendConfig(
153153
sb,
154154
"Exception Profiling Enabled",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected ProfilerSettingsSupport(
153153
ProfilingConfig.PROFILING_CPU_ENABLED, ProfilingConfig.PROFILING_CPU_ENABLED_DEFAULT);
154154
wallProfilingEnabled =
155155
configProvider.getBoolean(
156-
ProfilingConfig.PROFILING_WALL_ENABLED, ProfilingConfig.PROFILING_WALL_ENABLED_DEFAULT);
156+
ProfilingConfig.PROFILING_WALLTIME_ENABLED, ProfilingConfig.PROFILING_WALLTIME_ENABLED_DEFAULT);
157157
exceptionProfilingEnabled =
158158
configProvider.getBoolean(
159159
ProfilingConfig.PROFILING_EXCEPTION_ENABLED,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
import static datadog.trace.api.config.ProfilingConfig.PROFILING_STACKDEPTH;
5454
import static datadog.trace.api.config.ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT;
5555
import static datadog.trace.api.config.ProfilingConfig.PROFILING_ULTRA_MINIMAL;
56-
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALL_ENABLED;
57-
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALL_ENABLED_DEFAULT;
56+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALLTIME_ENABLED;
57+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_WALLTIME_ENABLED_DEFAULT;
5858
import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED;
5959

6060
import com.datadog.profiling.controller.ProfilingSupport;
@@ -124,7 +124,7 @@ public static boolean isWallClockProfilerEnabled() {
124124
}
125125

126126
public static boolean isWallClockProfilerEnabled(ConfigProvider configProvider) {
127-
if (!configProvider.getBoolean(PROFILING_WALL_ENABLED, PROFILING_WALL_ENABLED_DEFAULT)) {
127+
if (!configProvider.getBoolean(PROFILING_WALLTIME_ENABLED, PROFILING_WALLTIME_ENABLED_DEFAULT)) {
128128
return false;
129129
}
130130
boolean isUltraMinimal = getBoolean(configProvider, PROFILING_ULTRA_MINIMAL, false);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public final class ProfilingConfig {
2727

2828
public static final String PROFILING_CPU_ENABLED = "profiling.cpu.enabled";
2929
public static final boolean PROFILING_CPU_ENABLED_DEFAULT = true;
30-
public static final String PROFILING_WALL_ENABLED = "profiling.walltime.enabled";
31-
public static final boolean PROFILING_WALL_ENABLED_DEFAULT = true;
30+
public static final String PROFILING_WALLTIME_ENABLED = "profiling.walltime.enabled";
31+
public static final boolean PROFILING_WALLTIME_ENABLED_DEFAULT = true;
3232
public static final String PROFILING_EXCEPTION_ENABLED = "profiling.exception.enabled";
3333
public static final boolean PROFILING_EXCEPTION_ENABLED_DEFAULT = true;
3434
public static final String PROFILING_IO_ENABLED = "profiling.io.enabled";

0 commit comments

Comments
 (0)