Skip to content

Commit fe762c4

Browse files
committed
feat(env): Migrate config to environment component
1 parent d93b2a0 commit fe762c4

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@
633633
import datadog.environment.EnvironmentVariables;
634634
import datadog.environment.JavaVirtualMachine;
635635
import datadog.environment.OperatingSystem;
636+
import datadog.environment.SystemProperties;
636637
import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
637638
import datadog.trace.api.config.GeneralConfig;
638639
import datadog.trace.api.config.ProfilingConfig;
@@ -1237,7 +1238,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
12371238
configFileStatus = configProvider.getConfigFileStatus();
12381239
runtimeIdEnabled =
12391240
configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
1240-
runtimeVersion = System.getProperty("java.version", "unknown");
1241+
runtimeVersion = SystemProperties.getOrDefault("java.version", "unknown");
12411242

12421243
// Note: We do not want APiKey to be loaded from property for security reasons
12431244
// Note: we do not use defined default here
@@ -3398,7 +3399,7 @@ public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
33983399
// don't want to put this logic (which will evolve) in the public ProfilingConfig, and can't
33993400
// access Platform there
34003401
if (!JavaVirtualMachine.isJ9() && isJavaVersion(8)) {
3401-
String arch = System.getProperty("os.arch");
3402+
String arch = SystemProperties.get("os.arch");
34023403
if ("aarch64".equalsIgnoreCase(arch) || "arm64".equalsIgnoreCase(arch)) {
34033404
return false;
34043405
}
@@ -4442,12 +4443,12 @@ public CiVisibilityWellKnownTags getCiVisibilityWellKnownTags() {
44424443
getRuntimeId(),
44434444
getEnv(),
44444445
LANGUAGE_TAG_VALUE,
4445-
System.getProperty("java.runtime.name"),
4446-
System.getProperty("java.version"),
4447-
System.getProperty("java.vendor"),
4448-
System.getProperty("os.arch"),
4449-
System.getProperty("os.name"),
4450-
System.getProperty("os.version"),
4446+
SystemProperties.get("java.runtime.name"),
4447+
SystemProperties.get("java.version"),
4448+
SystemProperties.get("java.vendor"),
4449+
SystemProperties.get("os.arch"),
4450+
SystemProperties.get("os.name"),
4451+
SystemProperties.get("os.version"),
44514452
isServiceNameSetByUser() ? "true" : "false");
44524453
}
44534454

@@ -5209,7 +5210,7 @@ private static String getProp(String name) {
52095210
}
52105211

52115212
private static String getProp(String name, String def) {
5212-
String value = System.getProperty(name, def);
5213+
String value = SystemProperties.getOrDefault(name, def);
52135214
if (value != null) {
52145215
ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP);
52155216
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast;
66
import static datadog.environment.JavaVirtualMachine.isOracleJDK8;
77

8+
import datadog.environment.SystemProperties;
9+
810
/**
911
* This class is used early on during premain; it must not touch features like JMX or JUL in case
1012
* they trigger early loading/binding.
@@ -51,7 +53,7 @@ private static boolean checkForJfr() {
5153

5254
private static boolean checkForNativeImageBuilder() {
5355
try {
54-
return "org.graalvm.nativeimage.builder".equals(System.getProperty("jdk.module.main"));
56+
return "org.graalvm.nativeimage.builder".equals(SystemProperties.get("jdk.module.main"));
5557
} catch (Throwable e) {
5658
return false;
5759
}

internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.api.env;
22

3+
import datadog.environment.EnvironmentVariables;
34
import datadog.environment.JavaVirtualMachine;
45
import datadog.trace.api.config.GeneralConfig;
56
import java.io.File;
@@ -77,8 +78,8 @@ static void useFixedProcessInfo(final ProcessInfo processInfo) {
7778
* autodetection will return either the JAR filename or the java main class.
7879
*/
7980
private String autodetectServiceName() {
80-
String inAas = System.getenv("DD_AZURE_APP_SERVICES");
81-
String siteName = System.getenv("WEBSITE_SITE_NAME");
81+
String inAas = EnvironmentVariables.get("DD_AZURE_APP_SERVICES");
82+
String siteName = EnvironmentVariables.get("WEBSITE_SITE_NAME");
8283

8384
if (("true".equalsIgnoreCase(inAas) || "1".equals(inAas)) && siteName != null) {
8485
return siteName;

0 commit comments

Comments
 (0)