PR comments

Author: mhlidd

components/environment/src/main/java/datadog/environment/EnvironmentVariables.java

@@ -19,6 +19,8 @@ private EnvironmentVariables() {}
 
   public static class EnvironmentVariablesProvider {
 
+    // Environment Component has SecurityException handling, so it is safe to call System.getenv
+    // here
     @SuppressForbidden
     public String get(String name) {
       return System.getenv(name);

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java

@@ -23,11 +23,11 @@ public final class Constants {
     "datadog.appsec.api",
     "datadog.trace.api",
     "datadog.trace.bootstrap",
+    "datadog.trace.config.inversion",
     "datadog.trace.context",
     "datadog.trace.instrumentation.api",
     "datadog.trace.logging",
     "datadog.trace.util",
-    "datadog.trace.config.inversion", // Add this line
   };
 
   private Constants() {}

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

@@ -108,7 +108,7 @@ private static boolean isFlagEnabled(
     if ("false".equalsIgnoreCase(value)) {
       return false;
     }
-    value = ConfigHelper.get().getEnvironmentVariable(envVar);
+    value = ConfigHelper.env(envVar);
     if ("true".equalsIgnoreCase(value)) {
       return true;
     }

dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java

@@ -70,11 +70,11 @@ public void launcherSessionOpened(LauncherSession session) {
     "datadog.appsec.api",
     "datadog.trace.api",
     "datadog.trace.bootstrap",
+    "datadog.trace.config.inversion",
     "datadog.trace.context",
     "datadog.trace.instrumentation.api",
     "datadog.trace.logging",
     "datadog.trace.util",
-    "datadog.trace.config.inversion", // Add this line
   };
 
   public static final ClassPath TEST_CLASSPATH = computeTestClasspath();

dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java

@@ -61,7 +61,7 @@ public String[] helperClassNames() {
 
   @Override
   protected boolean defaultEnabled() {
-    return ConfigHelper.get().getEnvironmentVariable(HANDLER_ENV_NAME) != null;
+    return ConfigHelper.env(HANDLER_ENV_NAME) != null;
   }
 
   @Override

dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java

@@ -66,8 +66,7 @@ public abstract class MavenUtils {
    * of the request object
    */
   public static String getCommandLine(MavenSession session) {
-    String mavenCmdLineArgsEnvVar =
-        ConfigHelper.get().getEnvironmentVariable(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
+    String mavenCmdLineArgsEnvVar = ConfigHelper.env(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
     if (mavenCmdLineArgsEnvVar != null) {
       return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsEnvVar;
     }

gradle/forbiddenApiFilters/main.txt

@@ -29,8 +29,8 @@ net.bytebuddy.matcher.ElementMatchers#isAbstract()
 java.lang.System#out
 java.lang.System#err
 
-# avoid using System.getenv() or System.getenv(String) in code outside of ConfigHelper.java
-@defaultMessage Avoid using System.getenv() or System.getenv(String) in code outside of ConfigHelper.java
+# use ConfigHelper to access environment variables instead of using System.getenv() or System.getenv(String)
+@defaultMessage Use ConfigHelper to access environment variables instead of using System.getenv() or System.getenv(String)
 java.lang.System#getenv()
 java.lang.System#getenv(java.lang.String)
 

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

@@ -5386,7 +5386,7 @@ private static boolean isWindowsOS() {
   }
 
   private static String getEnv(String name) {
-    String value = ConfigHelper.get().getEnvironmentVariable(name);
+    String value = ConfigHelper.env(name);
     if (value != null) {
       // Report non-default sequence id for consistency
       ConfigCollector.get().put(name, value, ConfigOrigin.ENV, NON_DEFAULT_SEQ_ID);

internal-api/src/main/java/datadog/trace/util/PidHelper.java

@@ -80,13 +80,13 @@ private static String getTempDir() {
         return "/tmp";
       } else if (OperatingSystem.isWindows()) {
         return Stream.of("TMP", "TEMP", "USERPROFILE")
-            .map(ConfigHelper.get()::getEnvironmentVariable)
+            .map(ConfigHelper::env)
             .filter(Objects::nonNull)
             .filter(((Predicate<String>) String::isEmpty).negate())
             .findFirst()
             .orElse("C:\\Windows");
       } else if (OperatingSystem.isMacOs()) {
-        return ConfigHelper.get().getEnvironmentVariable("TMPDIR");
+        return ConfigHelper.env("TMPDIR");
       } else {
         return SystemProperties.get("java.io.tmpdir");
       }

internal-api/src/main/java/datadog/trace/util/TempLocationManager.java

@@ -300,7 +300,7 @@ private TempLocationManager() {
   static String getBaseTempDirName() {
     String userName = SystemProperties.get("user.name");
     // unlikely, but fall-back to system env based user name
-    userName = userName == null ? ConfigHelper.get().getEnvironmentVariable("USER") : userName;
+    userName = userName == null ? ConfigHelper.env("USER") : userName;
     // make sure we do not have any illegal characters in the user name
     userName =
         userName != null ? userName.replace('.', '_').replace('/', '_').replace(' ', '_') : null;