change to a single check at the end of the config init

Author: vandonr

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

@@ -41,7 +41,6 @@
 import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling;
 import datadog.trace.util.AgentTaskScheduler;
 import datadog.trace.util.AgentThreadFactory.AgentThread;
-import datadog.trace.util.SystemUtils;
 import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
@@ -371,18 +370,6 @@ public void run() {
       StaticEventLogger.end("Profiling");
     }
 
-    // log eventual errors that would have happened before we could log them
-    if (SystemUtils.hasEnvError) {
-      log.warn(
-          "The Java Security Manager prevented the Datadog Tracer from accessing at least one environment variable. "
-              + "Consider granting AllPermission to the dd-java-agent jar.");
-    }
-    if (SystemUtils.hasPropertyError) {
-      log.warn(
-          "The Java Security Manager prevented the Datadog Tracer from accessing at least one system property. "
-              + "Consider granting AllPermission to the dd-java-agent jar.");
-    }
-
     StaticEventLogger.end("Agent.start");
   }
 

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -1794,6 +1794,19 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
           "AppSec SCA is enabled but telemetry is disabled. AppSec SCA will not work.");
     }
 
+    // check if the security manager is causing us trouble
+    if (!SystemUtils.canAccessEnvironmentVariables()) {
+      log.warn(
+          "The Java Security Manager is preventing the Datadog Tracer from accessing some environment variables. "
+              + "Consider granting AllPermission to the dd-java-agent jar.");
+    }
+
+    if (!SystemUtils.canAccessSystemProperties()) {
+      log.warn(
+          "The Java Security Manager is preventing the Datadog Tracer from accessing some system properties. "
+              + "Consider granting AllPermission to the dd-java-agent jar.");
+    }
+
     log.debug("New instance: {}", this);
   }
 

internal-api/src/main/java/datadog/trace/util/SystemUtils.java

@@ -14,7 +14,6 @@ public static String getEnvOrDefault(String envVar, String defaultValue) {
     try {
       return System.getenv(envVar);
     } catch (SecurityException e) {
-      hasEnvError = true;
       return defaultValue;
     }
   }
@@ -23,7 +22,6 @@ public static String tryGetProperty(String property) {
     try {
       return System.getProperty(property);
     } catch (SecurityException e) {
-      hasPropertyError = true;
       return null;
     }
   }
@@ -32,8 +30,27 @@ public static String getPropertyOrDefault(String property, String defaultValue)
     try {
       return System.getProperty(property, defaultValue);
     } catch (SecurityException e) {
-      hasPropertyError = true;
       return defaultValue;
     }
   }
+
+  public static boolean canAccessSystemProperties() {
+    try {
+      // try to access a common system property and see what happens
+      System.getProperty("os.name");
+    } catch (SecurityException e) {
+      return false;
+    }
+    return true;
+  }
+
+  public static boolean canAccessEnvironmentVariables() {
+    try {
+      // try to access a common env var and see what happens
+      System.getenv("DD_ENV");
+    } catch (SecurityException e) {
+      return false;
+    }
+    return true;
+  }
 }