From 2027027e4635b61fce70f462d21e46ab4fca2825 Mon Sep 17 00:00:00 2001 From: Luca Abbati Date: Wed, 3 Jul 2019 15:24:51 +0200 Subject: [PATCH 1/2] Explitely run JmxFetch app as a daemon --- dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle | 2 +- .../src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle b/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle index c075f69f728..5caf2e47307 100644 --- a/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle +++ b/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle @@ -4,7 +4,7 @@ plugins { apply from: "${rootDir}/gradle/java.gradle" dependencies { - compile('com.datadoghq:jmxfetch:0.29.0'){ + compile('com.datadoghq:jmxfetch:0.30.0--------------yet-to-be-released'){ exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'log4j', module: 'log4j' } diff --git a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java index 321e626314b..b432aba41ba 100644 --- a/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java +++ b/dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java @@ -74,6 +74,8 @@ private static void run(final Config config) { final AppConfig.AppConfigBuilder configBuilder = AppConfig.builder() .action(ImmutableList.of(ACTION_COLLECT)) + // App should be run as daemon otherwise CLI apps would not exit once main method exits. + .daemon(true) .confdDirectory(jmxFetchConfigDir) .yamlFileList(jmxFetchConfigs) .targetDirectInstances(true) From 2e41e94774a3eff38ac9a448d566fcd15f6f1a35 Mon Sep 17 00:00:00 2001 From: Luca Abbati Date: Mon, 8 Jul 2019 14:43:29 -0400 Subject: [PATCH 2/2] Update jmxfetch to version 0.30.0 --- dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle b/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle index 5caf2e47307..b2f5f558628 100644 --- a/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle +++ b/dd-java-agent/agent-jmxfetch/agent-jmxfetch.gradle @@ -4,7 +4,7 @@ plugins { apply from: "${rootDir}/gradle/java.gradle" dependencies { - compile('com.datadoghq:jmxfetch:0.30.0--------------yet-to-be-released'){ + compile('com.datadoghq:jmxfetch:0.30.0'){ exclude group: 'org.slf4j', module: 'slf4j-log4j12' exclude group: 'log4j', module: 'log4j' }