feat(env): Migrate Agent to environment component

Author: PerfectSlayer

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

@@ -13,8 +13,10 @@
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 import static datadog.trace.util.Strings.toEnvVar;
 
+import datadog.environment.EnvironmentVariables;
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Config;
 import datadog.trace.api.Platform;
 import datadog.trace.api.StatsDClientManager;
@@ -269,7 +271,7 @@ public static void start(
             propertyNameToSystemPropertyName("integration.spark-openlineage.enabled"), "true");
       }
 
-      String javaCommand = System.getProperty("sun.java.command");
+      String javaCommand = String.join(" ", JavaVirtualMachine.getCommandArguments());
       String dataJobsCommandPattern = Config.get().getDataJobsCommandPattern();
       if (!isDataJobsSupported(javaCommand, dataJobsCommandPattern)) {
         log.warn(
@@ -283,8 +285,8 @@ public static void start(
     if (!isSupportedAppSecArch()) {
       log.debug(
           "OS and architecture ({}/{}) not supported by AppSec, dd.appsec.enabled will default to false",
-          System.getProperty("os.name"),
-          System.getProperty("os.arch"));
+          SystemProperties.get("os.name"),
+          SystemProperties.get("os.arch"));
       setSystemPropertyDefault(AgentFeature.APPSEC.getSystemProp(), "false");
     }
 
@@ -950,7 +952,7 @@ private static void startAppSec(SubscriptionService ss, Class<?> scoClass, Objec
   }
 
   private static boolean isSupportedAppSecArch() {
-    final String arch = System.getProperty("os.arch");
+    final String arch = SystemProperties.get("os.arch");
     if (OperatingSystem.isWindows()) {
       // TODO: Windows bindings need to be built for x86
       return "amd64".equals(arch) || "x86_64".equals(arch);
@@ -1260,13 +1262,7 @@ public void withTracer(TracerAPI tracer) {
   }
 
   private static boolean isAwsLambdaRuntime() {
-    String val = System.getenv("AWS_LAMBDA_FUNCTION_NAME");
-    return val != null && !val.isEmpty();
-  }
-
-  private static ScopeListener createScopeListener(String className) throws Throwable {
-    return (ScopeListener)
-        AGENT_CLASSLOADER.loadClass(className).getDeclaredConstructor().newInstance();
+    return !EnvironmentVariables.getOrDefault("AWS_LAMBDA_FUNCTION_NAME", "").isEmpty();
   }
 
   private static void shutdownProfilingAgent(final boolean sync) {
@@ -1333,7 +1329,8 @@ private static synchronized void startDebuggerAgent(
   private static void configureLogger() {
     setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true");
     setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
-    if (System.getProperty(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY).equalsIgnoreCase("true")) {
+    String simpleLoggerJsonEnabled = SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY);
+    if (simpleLoggerJsonEnabled != null && simpleLoggerJsonEnabled.equalsIgnoreCase("true")) {
       setSystemPropertyDefault(
           SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT);
     } else {
@@ -1347,7 +1344,7 @@ private static void configureLogger() {
     } else {
       logLevel = ddGetProperty("dd.log.level");
       if (null == logLevel) {
-        logLevel = System.getenv("OTEL_LOG_LEVEL");
+        logLevel = EnvironmentVariables.get("OTEL_LOG_LEVEL");
       }
     }
 
@@ -1361,8 +1358,8 @@ private static void configureLogger() {
   }
 
   private static void setSystemPropertyDefault(final String property, final String value) {
-    if (System.getProperty(property) == null && ddGetEnv(property) == null) {
-      System.setProperty(property, value);
+    if (SystemProperties.get(property) == null && ddGetEnv(property) == null) {
+      SystemProperties.set(property, value);
     }
   }
 
@@ -1383,7 +1380,7 @@ private static ClassLoader getPlatformClassLoader()
    */
   private static boolean isDebugMode() {
     final String tracerDebugLevelSysprop = "dd.trace.debug";
-    final String tracerDebugLevelProp = System.getProperty(tracerDebugLevelSysprop);
+    final String tracerDebugLevelProp = SystemProperties.get(tracerDebugLevelSysprop);
 
     if (tracerDebugLevelProp != null) {
       return Boolean.parseBoolean(tracerDebugLevelProp);
@@ -1402,7 +1399,7 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
     // must be kept in sync with logic from Config!
     final String featureConfigKey = feature.getConfigKey();
     final String featureSystemProp = feature.getSystemProp();
-    String featureEnabled = System.getProperty(featureSystemProp);
+    String featureEnabled = SystemProperties.get(featureSystemProp);
     if (featureEnabled == null) {
       featureEnabled = getStableConfig(StableConfigSource.FLEET, featureConfigKey);
     }
@@ -1432,7 +1429,7 @@ private static boolean isFullyDisabled(final AgentFeature feature) {
     // must be kept in sync with logic from Config!
     final String featureConfigKey = feature.getConfigKey();
     final String featureSystemProp = feature.getSystemProp();
-    String settingValue = getNullIfEmpty(System.getProperty(featureSystemProp));
+    String settingValue = getNullIfEmpty(SystemProperties.get(featureSystemProp));
     if (settingValue == null) {
       settingValue = getNullIfEmpty(getStableConfig(StableConfigSource.FLEET, featureConfigKey));
     }
@@ -1489,7 +1486,7 @@ private static int getJmxStartDelay() {
    */
   private static boolean isAppUsingCustomLogManager(final EnumSet<Library> libraries) {
     final String tracerCustomLogManSysprop = "dd.app.customlogmanager";
-    final String customLogManagerProp = System.getProperty(tracerCustomLogManSysprop);
+    final String customLogManagerProp = SystemProperties.get(tracerCustomLogManSysprop);
     final String customLogManagerEnv = ddGetEnv(tracerCustomLogManSysprop);
 
     if (customLogManagerProp != null || customLogManagerEnv != null) {
@@ -1504,7 +1501,7 @@ private static boolean isAppUsingCustomLogManager(final EnumSet<Library> librari
       return true; // Wildfly is known to set a custom log manager after startup.
     }
 
-    final String logManagerProp = System.getProperty("java.util.logging.manager");
+    final String logManagerProp = SystemProperties.get("java.util.logging.manager");
     if (logManagerProp != null) {
       log.debug("Prop - logging.manager: {}", logManagerProp);
       return true;
@@ -1521,7 +1518,7 @@ private static boolean isAppUsingCustomLogManager(final EnumSet<Library> librari
    */
   private static boolean isAppUsingCustomJMXBuilder(final EnumSet<Library> libraries) {
     final String tracerCustomJMXBuilderSysprop = "dd.app.customjmxbuilder";
-    final String customJMXBuilderProp = System.getProperty(tracerCustomJMXBuilderSysprop);
+    final String customJMXBuilderProp = SystemProperties.get(tracerCustomJMXBuilderSysprop);
     final String customJMXBuilderEnv = ddGetEnv(tracerCustomJMXBuilderSysprop);
 
     if (customJMXBuilderProp != null || customJMXBuilderEnv != null) {
@@ -1536,7 +1533,7 @@ private static boolean isAppUsingCustomJMXBuilder(final EnumSet<Library> librari
       return true; // Wildfly is known to set a custom JMX builder after startup.
     }
 
-    final String jmxBuilderProp = System.getProperty("javax.management.builder.initial");
+    final String jmxBuilderProp = SystemProperties.get("javax.management.builder.initial");
     if (jmxBuilderProp != null) {
       log.debug("Prop - javax.management.builder.initial: {}", jmxBuilderProp);
       return true;
@@ -1547,7 +1544,7 @@ private static boolean isAppUsingCustomJMXBuilder(final EnumSet<Library> librari
 
   /** Looks for the "dd." system property first then the "DD_" environment variable equivalent. */
   private static String ddGetProperty(final String sysProp) {
-    String value = System.getProperty(sysProp);
+    String value = SystemProperties.get(sysProp);
     if (null == value) {
       value = ddGetEnv(sysProp);
     }
@@ -1561,7 +1558,7 @@ private static String getStableConfig(StableConfigSource source, final String sy
 
   /** Looks for the "DD_" environment variable equivalent of the given "dd." system property. */
   private static String ddGetEnv(final String sysProp) {
-    return System.getenv(toEnvVar(sysProp));
+    return EnvironmentVariables.get(toEnvVar(sysProp));
   }
 
   private static boolean okHttpMayIndirectlyLoadJUL() {