Skip to content

Commit b1b0ab3

Browse files
authored
Add DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED alias for runtime id generation (#8981)
1 parent 42c66c7 commit b1b0ab3

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public final class GeneralConfig {
5454

5555
public static final String RUNTIME_METRICS_ENABLED = "runtime.metrics.enabled";
5656
public static final String RUNTIME_ID_ENABLED = "runtime-id.enabled";
57+
public static final String RUNTIME_METRICS_RUNTIME_ID_ENABLED =
58+
"runtime.metrics.runtime-id.enabled";
5759

5860
public static final String HEALTH_METRICS_ENABLED = "trace.health.metrics.enabled";
5961
public static final String HEALTH_METRICS_STATSD_HOST = "trace.health.metrics.statsd.host";

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
601601
this.configProvider = configProvider;
602602
this.instrumenterConfig = instrumenterConfig;
603603
configFileStatus = configProvider.getConfigFileStatus();
604-
runtimeIdEnabled = configProvider.getBoolean(RUNTIME_ID_ENABLED, true);
604+
runtimeIdEnabled =
605+
configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
605606
runtimeVersion = System.getProperty("java.version", "unknown");
606607

607608
// Note: We do not want APiKey to be loaded from property for security reasons

internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,30 @@ package datadog.trace.api
33
import spock.lang.Specification
44

55
import static datadog.trace.api.config.GeneralConfig.RUNTIME_ID_ENABLED
6+
import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_RUNTIME_ID_ENABLED
67

78
class ConfigForkedTest extends Specification {
89

910
static final String PREFIX = "dd."
1011

12+
def getSetting() {
13+
RUNTIME_ID_ENABLED
14+
}
15+
1116
def "test random runtime id generation can be turned off"(){
1217
setup:
13-
System.setProperty(PREFIX + RUNTIME_ID_ENABLED, "false")
18+
System.setProperty(PREFIX + getSetting(), "false")
1419

1520
when:
1621
def config = new Config()
1722
then:
1823
config.runtimeId == ""
1924
}
2025
}
26+
27+
class RuntimeMetricsRuntimeIdAliasForkedTest extends ConfigForkedTest {
28+
@Override
29+
def getSetting() {
30+
RUNTIME_METRICS_RUNTIME_ID_ENABLED
31+
}
32+
}

0 commit comments

Comments
 (0)