Skip to content

Add DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED alias for runtime id generation #8981

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
amarziali merged 1 commit into from
Jun 16, 2025
Merged

Add DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED alias for runtime id generation #8981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion internal-api/src/test/groovy/datadog/trace/api/ConfigForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,30 @@ 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()
then:
config.runtimeId == ""
}
}

class RuntimeMetricsRuntimeIdAliasForkedTest extends ConfigForkedTest {
@Override
def getSetting() {
RUNTIME_METRICS_RUNTIME_ID_ENABLED
}
}