feat(environment): Use SystemProperties within component

Author: PerfectSlayer

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

@@ -94,7 +94,7 @@ public static boolean isOracleJDK8() {
   }
 
   public static boolean isJ9() {
-    return System.getProperty("java.vm.name").contains("J9");
+    return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");
   }
 
   public static boolean isIbm8() {
@@ -190,11 +190,11 @@ static final class Runtime {
 
     public Runtime() {
       this(
-          System.getProperty("java.version"),
-          System.getProperty("java.runtime.version"),
-          System.getProperty("java.runtime.name"),
-          System.getProperty("java.vm.vendor"),
-          System.getProperty("java.vendor.version"));
+          SystemProperties.get("java.version"),
+          SystemProperties.get("java.runtime.version"),
+          SystemProperties.get("java.runtime.name"),
+          SystemProperties.get("java.vm.vendor"),
+          SystemProperties.get("java.vendor.version"));
     }
 
     // Only visible for testing

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

@@ -1,5 +1,7 @@
 package datadog.environment;
 
+import static java.util.Locale.ROOT;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -8,10 +10,12 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Locale;
 
 /** Detects operating systems and libc library. */
 public final class OperatingSystem {
+  private static final String OS_NAME_PROPERTY = "os.name";
+  private static final String OS_ARCH_PROPERTY = "os.arch";
+
   private OperatingSystem() {}
 
   /**
@@ -20,7 +24,7 @@ private OperatingSystem() {}
    * @return @{@code true} if operating system is Linux based, {@code false} otherwise.
    */
   public static boolean isLinux() {
-    return System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux");
+    return propertyContains(OS_NAME_PROPERTY, "linux");
   }
 
   /**
@@ -30,8 +34,7 @@ public static boolean isLinux() {
    */
   public static boolean isWindows() {
     // https://mkyong.com/java/how-to-detect-os-in-java-systemgetpropertyosname/
-    final String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-    return os.contains("win");
+    return propertyContains(OS_NAME_PROPERTY, "win");
   }
 
   /**
@@ -40,8 +43,7 @@ public static boolean isWindows() {
    * @return @{@code true} if operating system is macOS, {@code false} otherwise.
    */
   public static boolean isMacOs() {
-    final String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-    return os.contains("mac");
+    return propertyContains(OS_NAME_PROPERTY, "mac");
   }
 
   /**
@@ -50,7 +52,11 @@ public static boolean isMacOs() {
    * @return {@code true} if the architecture is AArch64, {@code false} otherwise.
    */
   public static boolean isAarch64() {
-    return System.getProperty("os.arch").toLowerCase().contains("aarch64");
+    return propertyContains(OS_ARCH_PROPERTY, "aarch64");
+  }
+
+  private static boolean propertyContains(String property, String content) {
+    return SystemProperties.getOrDefault(property, "").toLowerCase(ROOT).contains(content);
   }
 
   /**
@@ -102,7 +108,7 @@ private static boolean isMuslJavaExecutable() throws IOException {
     byte[] prefix = new byte[] {(byte) '/', (byte) 'l', (byte) 'd', (byte) '-'}; // '/ld-*'
     byte[] musl = new byte[] {(byte) 'm', (byte) 'u', (byte) 's', (byte) 'l'}; // 'musl'
 
-    Path binary = Paths.get(System.getProperty("java.home"), "bin", "java");
+    Path binary = Paths.get(SystemProperties.getOrDefault("java.home", ""), "bin", "java");
     byte[] buffer = new byte[4096];
 
     try (InputStream is = Files.newInputStream(binary)) {