Skip to content

Commit eae6efa

Browse files
committed
feat(env): Migrate jmxfetch to environment component
1 parent fbaed32 commit eae6efa

File tree

1 file changed

+6
-4
lines changed
  • dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch

1 file changed

+6
-4
lines changed

dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static datadog.trace.util.AgentThreadFactory.newAgentThread;
55
import static org.datadog.jmxfetch.AppConfig.ACTION_COLLECT;
66

7+
import datadog.environment.SystemProperties;
78
import datadog.trace.api.Config;
89
import datadog.trace.api.GlobalTracer;
910
import datadog.trace.api.StatsDClient;
@@ -47,9 +48,9 @@ private static void run(final StatsDClientManager statsDClientManager, final Con
4748
}
4849

4950
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) {
5152
// 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");
5354
}
5455

5556
final String jmxFetchConfigDir = config.getJmxFetchConfigDir();
@@ -217,10 +218,11 @@ private static List<String> getInternalMetricFiles() {
217218
}
218219

219220
private static String getLogLocation() {
220-
return System.getProperty("org.slf4j.simpleLogger.logFile", "System.err");
221+
return SystemProperties.getOrDefault("org.slf4j.simpleLogger.logFile", "System.err");
221222
}
222223

223224
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();
225227
}
226228
}

0 commit comments

Comments
 (0)