do the "orDefault" as well

Author: vandonr

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

@@ -537,7 +537,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     this.instrumenterConfig = instrumenterConfig;
     configFileStatus = configProvider.getConfigFileStatus();
     runtimeIdEnabled = configProvider.getBoolean(RUNTIME_ID_ENABLED, true);
-    runtimeVersion = System.getProperty("java.version", "unknown");
+    runtimeVersion = SystemUtils.getPropertyOrDefault("java.version", "unknown");
 
     // Note: We do not want APiKey to be loaded from property for security reasons
     // Note: we do not use defined default here
@@ -3941,7 +3941,7 @@ private static String getProp(String name) {
   }
 
   private static String getProp(String name, String def) {
-    String value = System.getProperty(name, def);
+    String value = SystemUtils.getPropertyOrDefault(name, def);
     if (value != null) {
       ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP);
     }

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

@@ -26,7 +26,12 @@ public static String getEnvOrDefault(String envVar, String defaultValue) {
   }
 
   public static String tryGetProperty(String property) {
-    return getPropertyOrDefault(property, null);
+    try {
+      return System.getProperty(property);
+    } catch (SecurityException e) {
+      log.warn(logMessageOnSecurityError, "system property", property, e);
+      return null;
+    }
   }
 
   public static String getPropertyOrDefault(String property, String defaultValue) {