diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java index 8be2c2a975f..74a928245e6 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java @@ -54,6 +54,8 @@ public final class GeneralConfig { public static final String RUNTIME_METRICS_ENABLED = "runtime.metrics.enabled"; public static final String RUNTIME_ID_ENABLED = "runtime-id.enabled"; + public static final String RUNTIME_METRICS_RUNTIME_ID_ENABLED = + "runtime.metrics.runtime-id.enabled"; public static final String HEALTH_METRICS_ENABLED = "trace.health.metrics.enabled"; public static final String HEALTH_METRICS_STATSD_HOST = "trace.health.metrics.statsd.host"; diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index e77dd9dd6b8..ea43af9da0c 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -601,7 +601,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins this.configProvider = configProvider; this.instrumenterConfig = instrumenterConfig; configFileStatus = configProvider.getConfigFileStatus(); - runtimeIdEnabled = configProvider.getBoolean(RUNTIME_ID_ENABLED, true); + runtimeIdEnabled = + configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED); runtimeVersion = System.getProperty("java.version", "unknown"); // Note: We do not want APiKey to be loaded from property for security reasons diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy index 2b3226a7e0e..1699a69b8d2 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy @@ -3,14 +3,19 @@ package datadog.trace.api import spock.lang.Specification import static datadog.trace.api.config.GeneralConfig.RUNTIME_ID_ENABLED +import static datadog.trace.api.config.GeneralConfig.RUNTIME_METRICS_RUNTIME_ID_ENABLED class ConfigForkedTest extends Specification { static final String PREFIX = "dd." + def getSetting() { + RUNTIME_ID_ENABLED + } + def "test random runtime id generation can be turned off"(){ setup: - System.setProperty(PREFIX + RUNTIME_ID_ENABLED, "false") + System.setProperty(PREFIX + getSetting(), "false") when: def config = new Config() @@ -18,3 +23,10 @@ class ConfigForkedTest extends Specification { config.runtimeId == "" } } + +class RuntimeMetricsRuntimeIdAliasForkedTest extends ConfigForkedTest { + @Override + def getSetting() { + RUNTIME_METRICS_RUNTIME_ID_ENABLED + } +}