feat(env): Migrate ConfigProvider to environment component

PerfectSlayer · PerfectSlayer · commit b10125db6ef4 · 2025-07-28T14:30:54.000+02:00
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -632,8 +632,10 @@
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableSet;
 import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
 import datadog.trace.api.config.GeneralConfig;
 import datadog.trace.api.config.ProfilingConfig;
@@ -1239,7 +1241,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     configFileStatus = configProvider.getConfigFileStatus();
     runtimeIdEnabled =
         configProvider.getBoolean(RUNTIME_ID_ENABLED, true, RUNTIME_METRICS_RUNTIME_ID_ENABLED);
-    runtimeVersion = System.getProperty("java.version", "unknown");
+    runtimeVersion = SystemProperties.getOrDefault("java.version", "unknown");
 
     // Note: We do not want APiKey to be loaded from property for security reasons
     // Note: we do not use defined default here
@@ -3409,7 +3411,7 @@ public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
     // don't want to put this logic (which will evolve) in the public ProfilingConfig, and can't
     // access Platform there
     if (!JavaVirtualMachine.isJ9() && isJavaVersion(8)) {
-      String arch = System.getProperty("os.arch");
+      String arch = SystemProperties.get("os.arch");
       if ("aarch64".equalsIgnoreCase(arch) || "arm64".equalsIgnoreCase(arch)) {
         return false;
       }
@@ -4453,12 +4455,12 @@ public CiVisibilityWellKnownTags getCiVisibilityWellKnownTags() {
         getRuntimeId(),
         getEnv(),
         LANGUAGE_TAG_VALUE,
-        System.getProperty("java.runtime.name"),
-        System.getProperty("java.version"),
-        System.getProperty("java.vendor"),
-        System.getProperty("os.arch"),
-        System.getProperty("os.name"),
-        System.getProperty("os.version"),
+        SystemProperties.get("java.runtime.name"),
+        SystemProperties.get("java.version"),
+        SystemProperties.get("java.vendor"),
+        SystemProperties.get("os.arch"),
+        SystemProperties.get("os.name"),
+        SystemProperties.get("os.version"),
         isServiceNameSetByUser() ? "true" : "false");
   }
 
@@ -5197,7 +5199,7 @@ private static boolean isWindowsOS() {
   }
 
   private static String getEnv(String name) {
-    String value = System.getenv(name);
+    String value = EnvironmentVariables.get(name);
     if (value != null) {
       ConfigCollector.get().put(name, value, ConfigOrigin.ENV);
     }
@@ -5220,7 +5222,7 @@ private static String getProp(String name) {
   }
 
   private static String getProp(String name, String def) {
-    String value = System.getProperty(name, def);
+    String value = SystemProperties.getOrDefault(name, def);
     if (value != null) {
       ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP);
     }
diff --git a/internal-api/src/main/java/datadog/trace/api/Platform.java b/internal-api/src/main/java/datadog/trace/api/Platform.java
@@ -5,6 +5,8 @@
 import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast;
 import static datadog.environment.JavaVirtualMachine.isOracleJDK8;
 
+import datadog.environment.SystemProperties;
+
 /**
  * This class is used early on during premain; it must not touch features like JMX or JUL in case
  * they trigger early loading/binding.
@@ -51,7 +53,7 @@ private static boolean checkForJfr() {
 
   private static boolean checkForNativeImageBuilder() {
     try {
-      return "org.graalvm.nativeimage.builder".equals(System.getProperty("jdk.module.main"));
+      return "org.graalvm.nativeimage.builder".equals(SystemProperties.get("jdk.module.main"));
     } catch (Throwable e) {
       return false;
     }
diff --git a/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java b/internal-api/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
@@ -1,5 +1,6 @@
 package datadog.trace.api.env;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.environment.JavaVirtualMachine;
 import datadog.trace.api.config.GeneralConfig;
 import java.io.File;
@@ -77,8 +78,8 @@ static void useFixedProcessInfo(final ProcessInfo processInfo) {
    * autodetection will return either the JAR filename or the java main class.
    */
   private String autodetectServiceName() {
-    String inAas = System.getenv("DD_AZURE_APP_SERVICES");
-    String siteName = System.getenv("WEBSITE_SITE_NAME");
+    String inAas = EnvironmentVariables.get("DD_AZURE_APP_SERVICES");
+    String siteName = EnvironmentVariables.get("WEBSITE_SITE_NAME");
 
     if (("true".equalsIgnoreCase(inAas) || "1".equals(inAas)) && siteName != null) {
       return siteName;
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java
@@ -1,5 +1,7 @@
 package datadog.trace.bootstrap.config.provider;
 
+import datadog.environment.EnvironmentVariables;
+import datadog.environment.SystemProperties;
 import datadog.trace.util.Strings;
 import java.util.Map;
 
@@ -21,14 +23,14 @@ public static void injectAgentArgsConfig(Map<String, String> args) {
     }
     for (Map.Entry<String, String> e : args.entrySet()) {
       String propertyName = e.getKey();
-      String existingPropertyValue = System.getProperty(propertyName);
+      String existingPropertyValue = SystemProperties.get(propertyName);
       if (existingPropertyValue != null) {
         // system properties should have higher priority than agent arguments
         continue;
       }
 
       String envVarName = Strings.toEnvVar(propertyName);
-      String envVarValue = System.getenv(envVarName);
+      String envVarValue = EnvironmentVariables.get(envVarName);
       if (envVarValue != null) {
         // env variables should have higher priority than agent arguments
         continue;
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java
@@ -2,6 +2,7 @@
 
 import static datadog.trace.api.config.GeneralConfig.CONFIGURATION_FILE;
 
+import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigCollector;
 import datadog.trace.api.ConfigOrigin;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
@@ -471,8 +472,11 @@ private static Properties loadConfigurationFile(ConfigProvider configProvider) {
     }
 
     // Normalizing tilde (~) paths for unix systems
-    configurationFilePath =
-        configurationFilePath.replaceFirst("^~", System.getProperty("user.home"));
+    String home;
+    if (configurationFilePath.charAt(0) == '~'
+        && (home = SystemProperties.get("user.home")) != null) {
+      configurationFilePath = home + configurationFilePath.substring(1);
+    }
 
     // Configuration properties file is optional
     final File configurationFile = new File(configurationFilePath);
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java
@@ -1,22 +1,19 @@
 package datadog.trace.bootstrap.config.provider;
 
+import static datadog.trace.api.ConfigOrigin.ENV;
 import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.trace.api.ConfigOrigin;
 
 final class EnvironmentConfigSource extends ConfigProvider.Source {
-
   @Override
   protected String get(String key) {
-    try {
-      return System.getenv(propertyNameToEnvironmentVariableName(key));
-    } catch (SecurityException e) {
-      return null;
-    }
+    return EnvironmentVariables.get(propertyNameToEnvironmentVariableName(key));
   }
 
   @Override
   public ConfigOrigin origin() {
-    return ConfigOrigin.ENV;
+    return ENV;
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
@@ -14,7 +14,10 @@
 import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS;
 import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_STYLE;
 import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLE_RATE;
+import static datadog.trace.util.Strings.toEnvVar;
 
+import datadog.environment.EnvironmentVariables;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.TracePropagationStyle;
 import datadog.trace.api.telemetry.OtelEnvMetricCollector;
@@ -141,12 +144,8 @@ private String getOtelProperty(String otelSysProp, String ddSysProp) {
     }
     String ddValue = getDatadogProperty(ddSysProp);
     if (null != ddValue) {
-      String otelEnvVar = Strings.toEnvVar(otelSysProp);
-      log.warn(
-          "Both {} and {} are set, ignoring {}",
-          Strings.toEnvVar(ddSysProp),
-          otelEnvVar,
-          otelEnvVar);
+      String otelEnvVar = toEnvVar(otelSysProp);
+      log.warn("Both {} and {} are set, ignoring {}", toEnvVar(ddSysProp), otelEnvVar, otelEnvVar);
       otelEnvMetricCollector.setHidingOtelEnvVarMetric(
           Strings.toEnvVarLowerCase(otelSysProp), Strings.toEnvVarLowerCase(ddSysProp));
       return null;
@@ -186,9 +185,9 @@ private String getDatadogProperty(String sysProp) {
    * <p>Checks system properties and environment variables.
    */
   private static String getProperty(String sysProp) {
-    String value = System.getProperty(sysProp);
+    String value = SystemProperties.get(sysProp);
     if (null == value) {
-      value = System.getenv(Strings.toEnvVar(sysProp));
+      value = EnvironmentVariables.get(toEnvVar(sysProp));
     }
     return value;
   }
@@ -204,8 +203,10 @@ private void capture(String key, String value) {
   private static Properties loadOtelConfigFile() {
     String path = getProperty("otel.javaagent.configuration-file");
     if (null != path && !path.isEmpty()) {
-      if (path.charAt(0) == '~') {
-        path = System.getProperty("user.home") + path.substring(1);
+      // Inflate '~' prefix as home folder
+      String home;
+      if (path.charAt(0) == '~' && (home = SystemProperties.get("user.home")) != null) {
+        path = home + path.substring(1);
       }
       File file = new File(path);
       if (file.exists()) {
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigParser.java
@@ -1,5 +1,7 @@
 package datadog.trace.bootstrap.config.provider;
 
+import datadog.environment.EnvironmentVariables;
+import datadog.environment.SystemProperties;
 import datadog.trace.bootstrap.config.provider.stableconfig.Rule;
 import datadog.trace.bootstrap.config.provider.stableconfig.Selector;
 import datadog.trace.bootstrap.config.provider.stableconfig.StableConfig;
@@ -153,7 +155,7 @@ static boolean selectorMatch(String origin, List<String> matches, String operato
         if (key == null) {
           return false;
         }
-        String envValue = System.getenv(key.toUpperCase(Locale.ROOT));
+        String envValue = EnvironmentVariables.get(key.toUpperCase(Locale.ROOT));
         return matchOperator(envValue, operator, matches);
       case "process_arguments":
         if (key == null) {
@@ -166,7 +168,7 @@ static boolean selectorMatch(String origin, List<String> matches, String operato
               key);
           return false;
         }
-        String argValue = System.getProperty(key.substring(2));
+        String argValue = SystemProperties.get(key.substring(2));
         return matchOperator(argValue, operator, matches);
       case "tags":
         // TODO: Support this down the line (Must define the source of "tags" first)
@@ -229,7 +231,7 @@ private static String processTemplateVar(String templateVar) throws IOException
       if (envVar.isEmpty()) {
         throw new IOException("Empty environment variable name in template");
       }
-      String value = System.getenv(envVar.toUpperCase(Locale.ROOT));
+      String value = EnvironmentVariables.get(envVar.toUpperCase(Locale.ROOT));
       if (value == null || value.isEmpty()) {
         return UNDEFINED_VALUE;
       }
@@ -246,7 +248,7 @@ private static String processTemplateVar(String templateVar) throws IOException
             processArg);
         return UNDEFINED_VALUE;
       }
-      String value = System.getProperty(processArg.substring(2));
+      String value = SystemProperties.get(processArg.substring(2));
       if (value == null || value.isEmpty()) {
         return UNDEFINED_VALUE;
       }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java
@@ -1,22 +1,19 @@
 package datadog.trace.bootstrap.config.provider;
 
+import static datadog.trace.api.ConfigOrigin.JVM_PROP;
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 
+import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigOrigin;
 
 public final class SystemPropertiesConfigSource extends ConfigProvider.Source {
-
   @Override
   protected String get(String key) {
-    try {
-      return System.getProperty(propertyNameToSystemPropertyName(key));
-    } catch (SecurityException e) {
-      return null;
-    }
+    return SystemProperties.get(propertyNameToSystemPropertyName(key));
   }
 
   @Override
   public ConfigOrigin origin() {
-    return ConfigOrigin.JVM_PROP;
+    return JVM_PROP;
   }
 }
