fix(environment): Revert agent bootstrap migration

Author: PerfectSlayer

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

@@ -15,6 +15,7 @@ public final class Constants {
    */
   public static final String[] BOOTSTRAP_PACKAGE_PREFIXES = {
     "datadog.slf4j",
+    "datadog.cli",
     "datadog.context",
     "datadog.environment",
     "datadog.json",

dd-java-agent/build.gradle

@@ -240,6 +240,7 @@ tasks.withType(GenerateMavenPom).configureEach { task ->
 
 dependencies {
   implementation project(path: ':components:json')
+  implementation project(path: ':components:cli')
   implementation project(path: ':components:environment')
   modules {
     module("com.squareup.okio:okio") {

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

@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap;
 
+import static datadog.trace.bootstrap.SystemUtils.getPropertyOrEnvVar;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import datadog.environment.EnvironmentVariables;
-import datadog.environment.JavaVirtualMachine;
+import datadog.cli.CLIHelper;
 import datadog.environment.SystemProperties;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.BufferedReader;
@@ -64,6 +64,10 @@ public static void premain(final String agentArgs, final Instrumentation inst) {
   public static void agentmain(final String agentArgs, final Instrumentation inst) {
     BootstrapInitializationTelemetry initTelemetry;
 
+    // TODO Example calls that break Gradle smoke tests
+    String javaVersion = SystemProperties.get("java.version");
+    // String forwarderPath = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_PATH");
+
     try {
       initTelemetry = createInitializationTelemetry();
     } catch (Throwable t) {
@@ -91,7 +95,7 @@ public static void agentmain(final String agentArgs, final Instrumentation inst)
   }
 
   private static BootstrapInitializationTelemetry createInitializationTelemetry() {
-    String forwarderPath = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_PATH");
+    String forwarderPath = SystemUtils.tryGetEnv("DD_TELEMETRY_FORWARDER_PATH");
     if (forwarderPath == null) {
       return BootstrapInitializationTelemetry.noOpInstance();
     }
@@ -101,7 +105,7 @@ private static BootstrapInitializationTelemetry createInitializationTelemetry()
     initTelemetry.initMetaInfo("runtime_name", "jvm");
     initTelemetry.initMetaInfo("language_name", "jvm");
 
-    String javaVersion = SystemProperties.get("java.version");
+    String javaVersion = SystemUtils.tryGetProperty("java.version");
     if (javaVersion != null) {
       initTelemetry.initMetaInfo("runtime_version", javaVersion);
       initTelemetry.initMetaInfo("language_version", javaVersion);
@@ -164,12 +168,7 @@ static boolean getConfig(String configName) {
         return System.getenv(LIB_INJECTION_ENABLED_ENV_VAR) != null;
       case LIB_INJECTION_FORCE_SYS_PROP:
         {
-          String envVarName =
-              LIB_INJECTION_FORCE_SYS_PROP.replace('.', '_').replace('-', '_').toUpperCase();
-          String injectionForceFlag = EnvironmentVariables.get(envVarName);
-          if (injectionForceFlag == null) {
-            injectionForceFlag = SystemProperties.get(LIB_INJECTION_FORCE_SYS_PROP);
-          }
+          String injectionForceFlag = getPropertyOrEnvVar(LIB_INJECTION_FORCE_SYS_PROP);
           return "true".equalsIgnoreCase(injectionForceFlag) || "1".equals(injectionForceFlag);
         }
       default:
@@ -178,7 +177,7 @@ static boolean getConfig(String configName) {
   }
 
   private static void recordInstrumentationSource(String source) {
-    SystemProperties.set(LIB_INSTRUMENTATION_SOURCE_SYS_PROP, source);
+    SystemUtils.trySetProperty(LIB_INSTRUMENTATION_SOURCE_SYS_PROP, source);
   }
 
   static boolean exceptionCauseChainContains(Throwable ex, String exClassName) {
@@ -206,7 +205,7 @@ private static boolean alreadyInitialized() {
   }
 
   private static boolean isJdkTool() {
-    String moduleMain = SystemProperties.get("jdk.module.main");
+    String moduleMain = SystemUtils.tryGetProperty("jdk.module.main");
     if (null != moduleMain && !moduleMain.isEmpty() && moduleMain.charAt(0) == 'j') {
       switch (moduleMain) {
         case "java.base": // keytool
@@ -358,7 +357,7 @@ private static List<File> getAgentFilesFromVMArguments() {
       // - On IBM-based JDKs since at least 1.7
       // This prevents custom log managers from working correctly
       // Use reflection to bypass the loading of the class~
-      for (final String argument : JavaVirtualMachine.getVmOptions()) {
+      for (final String argument : CLIHelper.getVmArgs()) {
         if (argument.startsWith(JAVA_AGENT_ARGUMENT)) {
           int index = argument.indexOf('=', JAVA_AGENT_ARGUMENT.length());
           String agentPathname =

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

@@ -0,0 +1,53 @@
+package datadog.trace.bootstrap;
+
+public final class SystemUtils {
+  private SystemUtils() {}
+
+  public static String tryGetEnv(String envVar) {
+    return getEnvOrDefault(envVar, null);
+  }
+
+  public static String getEnvOrDefault(String envVar, String defaultValue) {
+    try {
+      return System.getenv(envVar);
+    } catch (SecurityException e) {
+      return defaultValue;
+    }
+  }
+
+  public static String tryGetProperty(String property) {
+    try {
+      return System.getProperty(property);
+    } catch (SecurityException e) {
+      return null;
+    }
+  }
+
+  public static String trySetProperty(String property, String value) {
+    try {
+      return System.setProperty(property, value);
+    } catch (SecurityException e) {
+      return null;
+    }
+  }
+
+  public static String getPropertyOrDefault(String property, String defaultValue) {
+    try {
+      return System.getProperty(property, defaultValue);
+    } catch (SecurityException e) {
+      return defaultValue;
+    }
+  }
+
+  private static String toEnvVar(String string) {
+    return string.replace('.', '_').replace('-', '_').toUpperCase();
+  }
+
+  public static String getPropertyOrEnvVar(String property) {
+    String envVarValue = System.getenv(toEnvVar(property));
+    if (envVarValue != null) {
+      return envVarValue;
+    }
+    return System.getProperty(property);
+  }
+}

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/SpockRunner.java

@@ -38,6 +38,7 @@ public class SpockRunner extends JUnitPlatform {
    */
   public static final String[] BOOTSTRAP_PACKAGE_PREFIXES_COPY = {
     "datadog.slf4j",
+    "datadog.cli",
     "datadog.context",
     "datadog.environment",
     "datadog.json",

gradle/dependencies.gradle

@@ -20,6 +20,7 @@ final class CachedData {
       exclude(project(':components:environment'))
       exclude(project(':components:json'))
       exclude(project(':components:yaml'))
+      exclude(project(':components:cli'))
       exclude(project(':remote-config:remote-config-api'))
       exclude(project(':remote-config:remote-config-core'))
       exclude(project(':telemetry'))

internal-api/build.gradle

@@ -243,6 +243,7 @@ dependencies {
   // references TraceScope and Continuation from public api
   api project(':dd-trace-api')
   api libs.slf4j
+  api project(':components:cli')
   api project(':components:context')
   api project(':components:environment')
   api project(':components:yaml')

settings.gradle

@@ -86,6 +86,7 @@ include ':dd-java-agent:agent-otel:otel-shim'
 include ':dd-java-agent:agent-otel:otel-tooling'
 
 include ':communication'
+include ':components:cli'
 include ':components:context'
 include ':components:environment'
 include ':components:json'