|
4 | 4 | import static datadog.trace.util.AgentThreadFactory.newAgentThread; |
5 | 5 | import static org.datadog.jmxfetch.AppConfig.ACTION_COLLECT; |
6 | 6 |
|
| 7 | +import datadog.environment.SystemProperties; |
7 | 8 | import datadog.trace.api.Config; |
8 | 9 | import datadog.trace.api.GlobalTracer; |
9 | 10 | import datadog.trace.api.StatsDClient; |
@@ -47,9 +48,9 @@ private static void run(final StatsDClientManager statsDClientManager, final Con |
47 | 48 | } |
48 | 49 |
|
49 | 50 | if (!log.isDebugEnabled() |
50 | | - && System.getProperty("org.slf4j.simpleLogger.log.org.datadog.jmxfetch") == null) { |
| 51 | + && SystemProperties.get("org.slf4j.simpleLogger.log.org.datadog.jmxfetch") == null) { |
51 | 52 | // Reduce noisiness of jmxfetch logging. |
52 | | - System.setProperty("org.slf4j.simpleLogger.log.org.datadog.jmxfetch", "warn"); |
| 53 | + SystemProperties.set("org.slf4j.simpleLogger.log.org.datadog.jmxfetch", "warn"); |
53 | 54 | } |
54 | 55 |
|
55 | 56 | final String jmxFetchConfigDir = config.getJmxFetchConfigDir(); |
@@ -217,10 +218,11 @@ private static List<String> getInternalMetricFiles() { |
217 | 218 | } |
218 | 219 |
|
219 | 220 | private static String getLogLocation() { |
220 | | - return System.getProperty("org.slf4j.simpleLogger.logFile", "System.err"); |
| 221 | + return SystemProperties.getOrDefault("org.slf4j.simpleLogger.logFile", "System.err"); |
221 | 222 | } |
222 | 223 |
|
223 | 224 | private static String getLogLevel() { |
224 | | - return System.getProperty("org.slf4j.simpleLogger.defaultLogLevel", "info").toUpperCase(); |
| 225 | + return SystemProperties.getOrDefault("org.slf4j.simpleLogger.defaultLogLevel", "info") |
| 226 | + .toUpperCase(); |
225 | 227 | } |
226 | 228 | } |
0 commit comments