feat(env): Migrate internal apis to environment component

PerfectSlayer · PerfectSlayer · commit 29fea0d06c78 · 2025-08-01T21:52:52.000+02:00
diff --git a/internal-api/src/main/java/datadog/trace/api/ProcessTags.java b/internal-api/src/main/java/datadog/trace/api/ProcessTags.java
@@ -1,5 +1,7 @@
 package datadog.trace.api;
 
+import datadog.environment.EnvironmentVariables;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.env.CapturedEnvironment;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.util.TraceUtils;
@@ -27,7 +29,7 @@ public class ProcessTags {
   public static final String ENTRYPOINT_WORKDIR = "entrypoint.workdir";
 
   // visible for testing
-  static Function<String, String> envGetter = System::getenv;
+  static Function<String, String> envGetter = EnvironmentVariables::get;
 
   private static class Lazy {
     // the tags are used to compute a hash for dsm hence that map must be sorted.
@@ -58,20 +60,12 @@ private static void fillJeeTags(SortedMap<String, String> tags) {
 
     private static void insertTagFromSysPropIfPresent(
         Map<String, String> tags, String propKey, String tagKey) {
-      String value = maybeGetSystemProperty(propKey);
+      String value = SystemProperties.get(propKey);
       if (value != null) {
         tags.put(tagKey, value);
       }
     }
 
-    private static String maybeGetSystemProperty(String propKey) {
-      try {
-        return System.getProperty(propKey);
-      } catch (Throwable ignored) {
-      }
-      return null;
-    }
-
     private static boolean insertTagFromEnvIfPresent(
         Map<String, String> tags, String envKey, String tagKey) {
       try {
@@ -102,11 +96,7 @@ private static boolean insertLastPathSegmentIfPresent(
     }
 
     private static boolean hasSystemProperty(String propKey) {
-      try {
-        return System.getProperties().containsKey(propKey);
-      } catch (Throwable ignored) {
-      }
-      return false;
+      return SystemProperties.get(propKey) != null;
     }
 
     private static void fillBaseTags(Map<String, String> tags) {
@@ -123,12 +113,12 @@ private static void fillBaseTags(Map<String, String> tags) {
         insertLastPathSegmentIfPresent(tags, processInfo.jarFile.getParent(), ENTRYPOINT_BASEDIR);
       }
 
-      insertLastPathSegmentIfPresent(tags, maybeGetSystemProperty("user.dir"), ENTRYPOINT_WORKDIR);
+      insertLastPathSegmentIfPresent(tags, SystemProperties.get("user.dir"), ENTRYPOINT_WORKDIR);
     }
 
     private static boolean fillJbossTags(Map<String, String> tags) {
       if (insertLastPathSegmentIfPresent(
-          tags, maybeGetSystemProperty("jboss.home.dir"), "jboss.home")) {
+          tags, SystemProperties.get("jboss.home.dir"), "jboss.home")) {
         insertTagFromSysPropIfPresent(tags, "jboss.server.name", SERVER_NAME);
         tags.put("jboss.mode", hasSystemProperty("[Standalone]") ? "standalone" : "domain");
         tags.put(SERVER_TYPE, "jboss");
diff --git a/internal-api/src/main/java/datadog/trace/util/PidHelper.java b/internal-api/src/main/java/datadog/trace/util/PidHelper.java
@@ -1,15 +1,19 @@
 package datadog.trace.util;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -75,14 +79,16 @@ private static String getTempDir() {
       if (OperatingSystem.isLinux()) {
         return "/tmp";
       } else if (OperatingSystem.isWindows()) {
-        return Stream.of(System.getenv("TMP"), System.getenv("TEMP"), System.getenv("USERPROFILE"))
-            .filter(String::isEmpty)
+        return Stream.of("TMP", "TEMP", "USERPROFILE")
+            .map(EnvironmentVariables::get)
+            .filter(Objects::nonNull)
+            .filter(((Predicate<String>) String::isEmpty).negate())
             .findFirst()
             .orElse("C:\\Windows");
       } else if (OperatingSystem.isMacOs()) {
-        return System.getenv("TMPDIR");
+        return EnvironmentVariables.get("TMPDIR");
       } else {
-        return System.getProperty("java.io.tmpdir");
+        return SystemProperties.get("java.io.tmpdir");
       }
     } else {
       try {
@@ -93,7 +99,7 @@ private static String getTempDir() {
                 .invoke(null);
       } catch (Throwable t) {
         // Fall back to constants based on J9 source code, may not have perfect coverage
-        String tmpDir = System.getProperty("java.io.tmpdir");
+        String tmpDir = SystemProperties.get("java.io.tmpdir");
         if (tmpDir != null && !tmpDir.isEmpty()) {
           return tmpDir;
         } else if (OperatingSystem.isWindows()) {
@@ -114,7 +120,7 @@ private static Path getJavaProcessesDir() {
     } else {
       // Emulating the hotspot way to enumerate the JVM processes using the perfdata file
       // https://github.com/openjdk/jdk/blob/d7cb933b89839b692f5562aeeb92076cd25a99f6/src/hotspot/share/runtime/perfMemory.cpp#L244
-      return Paths.get(getTempDir(), "hsperfdata_" + System.getProperty("user.name"));
+      return Paths.get(getTempDir(), "hsperfdata_" + SystemProperties.get("user.name"));
     }
   }
 
diff --git a/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java b/internal-api/src/main/java/datadog/trace/util/ProcessUtils.java
@@ -1,6 +1,7 @@
 package datadog.trace.util;
 
 import datadog.environment.JavaVirtualMachine;
+import datadog.environment.SystemProperties;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
@@ -43,7 +44,7 @@ public static String getCurrentJvmPath() {
     }
 
     // JDK/JRE home, does not include "bin/java" portion
-    return System.getProperty("java.home");
+    return SystemProperties.get("java.home");
   }
 
   private ProcessUtils() {}
diff --git a/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java b/internal-api/src/main/java/datadog/trace/util/TempLocationManager.java
@@ -2,6 +2,8 @@
 
 import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
 
+import datadog.environment.EnvironmentVariables;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import java.io.IOException;
@@ -304,9 +306,9 @@ private TempLocationManager() {
 
   // @VisibleForTesting
   static String getBaseTempDirName() {
-    String userName = System.getProperty("user.name");
+    String userName = SystemProperties.get("user.name");
     // unlikely, but fall-back to system env based user name
-    userName = userName == null ? System.getenv("USER") : userName;
+    userName = userName == null ? EnvironmentVariables.get("USER") : userName;
     // make sure we do not have any illegal characters in the user name
     userName =
         userName != null ? userName.replace('.', '_').replace('/', '_').replace(' ', '_') : null;
diff --git a/telemetry/src/main/java/datadog/telemetry/HostInfo.java b/telemetry/src/main/java/datadog/telemetry/HostInfo.java
@@ -1,6 +1,7 @@
 package datadog.telemetry;
 
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -40,7 +41,7 @@ public static String getOsName() {
         // os.name == Mac OS X, while uanme -s == Darwin. We'll hardcode it to Darwin.
         osName = "Darwin";
       } else {
-        osName = System.getProperty("os.name");
+        osName = SystemProperties.get("os.name");
       }
     }
     return osName;
@@ -60,7 +61,7 @@ public static String getKernelName() {
   public static String getKernelRelease() {
     if (kernelRelease == null) {
       // In Linux, os.version == uname -r
-      kernelRelease = System.getProperty("os.version");
+      kernelRelease = SystemProperties.get("os.version");
     }
     return kernelRelease;
   }
@@ -78,7 +79,7 @@ public static String getKernelVersion() {
         }
         kernelVersion = version;
       } else {
-        kernelVersion = System.getProperty("os.version");
+        kernelVersion = SystemProperties.get("os.version");
       }
     }
     return kernelVersion;
@@ -87,7 +88,7 @@ public static String getKernelVersion() {
   public static String getArchitecture() {
     if (architecture == null) {
       // In Linux, os.arch == uname -me
-      architecture = System.getProperty("os.arch");
+      architecture = SystemProperties.get("os.arch");
     }
     return architecture;
   }
@@ -135,7 +136,7 @@ public static String getOsVersion() {
           return name + " " + version;
         }
       }
-      return System.getProperty("os.version");
+      return SystemProperties.get("os.version");
     }
   }
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java b/telemetry/src/main/java/datadog/telemetry/TelemetryRequest.java
@@ -2,6 +2,7 @@
 
 import datadog.common.container.ContainerInfo;
 import datadog.communication.ddagent.TracerVersion;
+import datadog.environment.EnvironmentVariables;
 import datadog.telemetry.api.DistributionSeries;
 import datadog.telemetry.api.Integration;
 import datadog.telemetry.api.LogMessage;
@@ -111,9 +112,9 @@ public void writeProducts() {
   }
 
   public void writeInstallSignature() {
-    String installId = System.getenv("DD_INSTRUMENTATION_INSTALL_ID");
-    String installType = System.getenv("DD_INSTRUMENTATION_INSTALL_TYPE");
-    String installTime = System.getenv("DD_INSTRUMENTATION_INSTALL_TIME");
+    String installId = EnvironmentVariables.get("DD_INSTRUMENTATION_INSTALL_ID");
+    String installType = EnvironmentVariables.get("DD_INSTRUMENTATION_INSTALL_TYPE");
+    String installTime = EnvironmentVariables.get("DD_INSTRUMENTATION_INSTALL_TIME");
 
     try {
       requestBody.writeInstallSignature(installId, installType, installTime);
diff --git a/utils/container-utils/build.gradle.kts b/utils/container-utils/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 apply(from = "$rootDir/gradle/java.gradle")
 
 dependencies {
+  implementation(project(":components:environment"))
   implementation(libs.slf4j)
 
   testImplementation(project(":utils:test-utils"))
diff --git a/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java b/utils/container-utils/src/main/java/datadog/common/container/ServerlessInfo.java
@@ -1,5 +1,6 @@
 package datadog.common.container;
 
+import datadog.environment.EnvironmentVariables;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 
@@ -12,7 +13,7 @@ public class ServerlessInfo {
   private final boolean hasExtension;
 
   private ServerlessInfo(final String extensionPath) {
-    this.functionName = System.getenv(AWS_FUNCTION_VARIABLE);
+    this.functionName = EnvironmentVariables.get(AWS_FUNCTION_VARIABLE);
     if (null == extensionPath) {
       this.hasExtension = false;
     } else {
diff --git a/utils/socket-utils/src/main/java/datadog/common/socket/SocketUtils.java b/utils/socket-utils/src/main/java/datadog/common/socket/SocketUtils.java
@@ -3,6 +3,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_SOCKET_PATH;
 
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import datadog.trace.api.config.TracerConfig;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -26,9 +27,9 @@ && new File(DEFAULT_TRACE_AGENT_SOCKET_PATH).exists()) {
     } else /* windows */ {
       if (unixDomainSocket != null) {
         log.warn(
-            "{} setting not supported on {}.  Reverting to the default.",
+            "{} setting not supported on {}. Reverting to the default.",
             TracerConfig.AGENT_UNIX_DOMAIN_SOCKET,
-            System.getProperty("os.name"));
+            SystemProperties.get("os.name"));
         unixDomainSocket = null;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package datadog.trace.util;`
`2`	`2`
`3`	`3`	`import datadog.environment.JavaVirtualMachine;`
	`4`	`+import datadog.environment.SystemProperties;`
`4`	`5`	`import de.thetaphi.forbiddenapis.SuppressForbidden;`
`5`	`6`	`import java.util.function.Supplier;`
`6`	`7`	`import javax.annotation.Nullable;`
`@@ -43,7 +44,7 @@ public static String getCurrentJvmPath() {`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`// JDK/JRE home, does not include "bin/java" portion`
`46`		`- return System.getProperty("java.home");`
	`47`	`+ return SystemProperties.get("java.home");`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`private ProcessUtils() {}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package datadog.telemetry;`
`2`	`2`
`3`	`3`	`import datadog.environment.OperatingSystem;`
	`4`	`+import datadog.environment.SystemProperties;`
`4`	`5`	`import datadog.trace.api.Config;`
`5`	`6`	`import java.io.IOException;`
`6`	`7`	`import java.nio.charset.StandardCharsets;`
`@@ -40,7 +41,7 @@ public static String getOsName() {`
`40`	`41`	`// os.name == Mac OS X, while uanme -s == Darwin. We'll hardcode it to Darwin.`
`41`	`42`	`osName = "Darwin";`
`42`	`43`	`} else {`
`43`		`- osName = System.getProperty("os.name");`
	`44`	`+ osName = SystemProperties.get("os.name");`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`	`return osName;`
`@@ -60,7 +61,7 @@ public static String getKernelName() {`
`60`	`61`	`public static String getKernelRelease() {`
`61`	`62`	`if (kernelRelease == null) {`
`62`	`63`	`// In Linux, os.version == uname -r`
`63`		`- kernelRelease = System.getProperty("os.version");`
	`64`	`+ kernelRelease = SystemProperties.get("os.version");`
`64`	`65`	`}`
`65`	`66`	`return kernelRelease;`
`66`	`67`	`}`
`@@ -78,7 +79,7 @@ public static String getKernelVersion() {`
`78`	`79`	`}`
`79`	`80`	`kernelVersion = version;`
`80`	`81`	`} else {`
`81`		`- kernelVersion = System.getProperty("os.version");`
	`82`	`+ kernelVersion = SystemProperties.get("os.version");`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`	`return kernelVersion;`
`@@ -87,7 +88,7 @@ public static String getKernelVersion() {`
`87`	`88`	`public static String getArchitecture() {`
`88`	`89`	`if (architecture == null) {`
`89`	`90`	`// In Linux, os.arch == uname -me`
`90`		`- architecture = System.getProperty("os.arch");`
	`91`	`+ architecture = SystemProperties.get("os.arch");`
`91`	`92`	`}`
`92`	`93`	`return architecture;`
`93`	`94`	`}`
`@@ -135,7 +136,7 @@ public static String getOsVersion() {`
`135`	`136`	`return name + " " + version;`
`136`	`137`	`}`
`137`	`138`	`}`
`138`		`- return System.getProperty("os.version");`
	`139`	`+ return SystemProperties.get("os.version");`
`139`	`140`	`}`
`140`	`141`	`}`
`141`	`142`	`}`