feat(civis): Migrate CI Visibility to environment component

Author: PerfectSlayer

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java

@@ -144,17 +144,17 @@ private static GitClient.Factory buildGitClientFactory(
 
   @Nonnull
   private static CiEnvironment buildCiEnvironment(Config config, SharedCommunicationObjects sco) {
+    CiEnvironment localEnvironment = CiEnvironmentImpl.local();
     String remoteEnvVarsProviderUrl = config.getCiVisibilityRemoteEnvVarsProviderUrl();
     if (remoteEnvVarsProviderUrl != null) {
       String remoteEnvVarsProviderKey = config.getCiVisibilityRemoteEnvVarsProviderKey();
       CiEnvironment remoteEnvironment =
           new CiEnvironmentImpl(
               getRemoteEnvironment(
                   remoteEnvVarsProviderUrl, remoteEnvVarsProviderKey, sco.okHttpClient));
-      CiEnvironment localEnvironment = new CiEnvironmentImpl(System.getenv());
       return new CompositeCiEnvironment(remoteEnvironment, localEnvironment);
     } else {
-      return new CiEnvironmentImpl(System.getenv());
+      return localEnvironment;
     }
   }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java

@@ -1,11 +1,13 @@
 package datadog.trace.civisibility;
 
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST;
+import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
+import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 
-import datadog.trace.api.config.CiVisibilityConfig;
+import datadog.environment.SystemProperties;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
-import datadog.trace.util.Strings;
 import java.net.InetSocketAddress;
 import java.util.Properties;
 import javax.annotation.Nullable;
@@ -69,8 +71,8 @@ private boolean isWrapper() {
   }
 
   private boolean isMavenParent() {
-    return System.getProperty("maven.home") != null
-            && System.getProperty("classworlds.conf") != null
+    return SystemProperties.get("maven.home") != null
+            && SystemProperties.get("classworlds.conf") != null
         // when using Maven Wrapper
         || ClassLoader.getSystemClassLoader()
                 .getResource("org/apache/maven/wrapper/WrapperExecutor.class")
@@ -82,7 +84,7 @@ private boolean isGradleDaemon() {
                 .getResource("org/gradle/launcher/daemon/bootstrap/GradleDaemon.class")
             != null
         // double-check this is not a Gradle Worker
-        && System.getProperties().getProperty("org.gradle.internal.worker.tmpdir") == null;
+        && SystemProperties.get("org.gradle.internal.worker.tmpdir") == null;
   }
 
   private boolean isGradleLauncher() {
@@ -93,16 +95,12 @@ private boolean isGradleLauncher() {
 
   @Nullable
   public InetSocketAddress getSignalServerAddress() {
-    // System.getProperty is used rather than Config,
+    // System properties are used rather than Config,
     // because system variables can be set after config was initialized
     String host =
-        System.getProperty(
-            Strings.propertyNameToSystemPropertyName(
-                CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST));
+        SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_HOST));
     String port =
-        System.getProperty(
-            Strings.propertyNameToSystemPropertyName(
-                CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT));
+        SystemProperties.get(propertyNameToSystemPropertyName(CIVISIBILITY_SIGNAL_SERVER_PORT));
     if (host != null && port != null) {
       return new InetSocketAddress(host, Integer.parseInt(port));
     } else {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/env/CiEnvironmentImpl.java

@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.ci.env;
 
+import java.util.Collections;
 import java.util.Map;
 
 public class CiEnvironmentImpl implements CiEnvironment {
@@ -10,6 +11,16 @@ public CiEnvironmentImpl(Map<String, String> env) {
     this.env = env;
   }
 
+  public static CiEnvironment local() {
+    Map<String, String> env;
+    try {
+      env = System.getenv();
+    } catch (SecurityException e) {
+      env = Collections.emptyMap();
+    }
+    return new CiEnvironmentImpl(env);
+  }
+
   @Override
   public String get(String name) {
     return env.get(name);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java

@@ -138,15 +138,18 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
       ExecutionSettings executionSettings,
       BuildSessionSettings sessionSettings) {
     Map<String, String> propagatedSystemProperties = new HashMap<>();
-    Properties systemProperties = System.getProperties();
-    for (Map.Entry<Object, Object> e : systemProperties.entrySet()) {
-      String propertyName = (String) e.getKey();
-      Object propertyValue = e.getValue();
-      if ((propertyName.startsWith(Config.PREFIX)
-              || propertyName.startsWith("datadog.slf4j.simpleLogger.defaultLogLevel"))
-          && propertyValue != null) {
-        propagatedSystemProperties.put(propertyName, propertyValue.toString());
+    try {
+      Properties systemProperties = System.getProperties();
+      for (Map.Entry<Object, Object> e : systemProperties.entrySet()) {
+        String propertyName = (String) e.getKey();
+        Object propertyValue = e.getValue();
+        if ((propertyName.startsWith(Config.PREFIX)
+                || propertyName.startsWith("datadog.slf4j.simpleLogger.defaultLogLevel"))
+            && propertyValue != null) {
+          propagatedSystemProperties.put(propertyName, propertyValue.toString());
+        }
       }
+    } catch (SecurityException ignored) {
     }
 
     propagatedSystemProperties.put(

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/FileUtils.java

@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.utils;
 
+import datadog.environment.SystemProperties;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -77,7 +78,7 @@ public static String expandTilde(final String path) {
       return path;
     }
 
-    return path.replaceFirst("^~", System.getProperty("user.home"));
+    return path.replaceFirst("^~", SystemProperties.getOrDefault("user.home", ""));
   }
 
   public static String toRealPath(String path) {

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

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.maven3;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.trace.api.civisibility.domain.JavaAgent;
 import datadog.trace.util.MethodHandles;
 import datadog.trace.util.Strings;
@@ -65,7 +66,7 @@ public abstract class MavenUtils {
    * of the request object
    */
   public static String getCommandLine(MavenSession session) {
-    String mavenCmdLineArgsEnvVar = System.getenv(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
+    String mavenCmdLineArgsEnvVar = EnvironmentVariables.get(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
     if (mavenCmdLineArgsEnvVar != null) {
       return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsEnvVar;
     }