diff --git a/internal-api/build.gradle b/internal-api/build.gradle index 001b0adfd4a..947fe5d0ea8 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -221,7 +221,11 @@ excludedClassesBranchCoverage = [ 'datadog.trace.util.stacktrace.HotSpotStackWalker', 'datadog.trace.util.stacktrace.StackWalkerFactory' ] -excludedClassesInstructionCoverage = ['datadog.trace.util.stacktrace.StackWalkerFactory'] +excludedClassesInstructionCoverage = [ + 'datadog.trace.bootstrap.config.provider.EnvironmentConfigSource', + 'datadog.trace.bootstrap.config.provider.SystemPropertiesConfigSource', + 'datadog.trace.util.stacktrace.StackWalkerFactory' +] compileTestJava.dependsOn 'generateTestClassNameTries' diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java index 6719693fd86..ffbdf6f77f2 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/EnvironmentConfigSource.java @@ -8,7 +8,11 @@ final class EnvironmentConfigSource extends ConfigProvider.Source { @Override protected String get(String key) { - return System.getenv(propertyNameToEnvironmentVariableName(key)); + try { + return System.getenv(propertyNameToEnvironmentVariableName(key)); + } catch (SecurityException e) { + return null; + } } @Override diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java index 08aaf487027..a0d561b5a37 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/config/provider/SystemPropertiesConfigSource.java @@ -8,7 +8,11 @@ public final class SystemPropertiesConfigSource extends ConfigProvider.Source { @Override protected String get(String key) { - return System.getProperty(propertyNameToSystemPropertyName(key)); + try { + return System.getProperty(propertyNameToSystemPropertyName(key)); + } catch (SecurityException e) { + return null; + } } @Override