feat(env): Migrate ConfigProvider to environment component

Author: PerfectSlayer

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;

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;
@@ -472,7 +473,7 @@ private static Properties loadConfigurationFile(ConfigProvider configProvider) {
 
     // Normalizing tilde (~) paths for unix systems
     configurationFilePath =
-        configurationFilePath.replaceFirst("^~", System.getProperty("user.home"));
+        configurationFilePath.replaceFirst("^~", SystemProperties.getOrDefault("user.home", ""));
 
     // Configuration properties file is optional
     final File configurationFile = new File(configurationFilePath);

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;
   }
 }

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;
   }
@@ -205,7 +204,7 @@ 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);
+        path = SystemProperties.getOrDefault("user.home", "") + path.substring(1);
       }
       File file = new File(path);
       if (file.exists()) {

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;
@@ -138,7 +140,7 @@ private static boolean checkEnvMatches(
     return false;
   }
 
-  // We do all of the case insensitivity modifications in this function, because each selector will
+  // We do all the case insensitivity modifications in this function, because each selector will
   // be viewed just once
   static boolean selectorMatch(String origin, List<String> matches, String operator, String key) {
     switch (origin.toLowerCase()) {
@@ -156,7 +158,7 @@ static boolean selectorMatch(String origin, List<String> matches, String operato
         if (key == null) {
           return false;
         }
-        String envValue = System.getenv(key.toUpperCase());
+        String envValue = EnvironmentVariables.get(key.toUpperCase());
         if (envValue == null) {
           return false;
         }
@@ -187,7 +189,7 @@ static boolean selectorMatch(String origin, List<String> matches, String operato
           return false;
         }
         // Cut the -D prefix
-        return System.getProperty(key.substring(2)) != null;
+        return SystemProperties.get(key.substring(2)) != null;
       case "tags":
         // TODO: Support this down the line (Must define the source of "tags" first)
         return false;
@@ -249,7 +251,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());
+      String value = EnvironmentVariables.get(envVar.toUpperCase());
       if (value == null || value.isEmpty()) {
         return UNDEFINED_VALUE;
       }
@@ -266,7 +268,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;
       }

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;
   }
 }