From e036962d365e0e25f50dac94f6d63ffe9541ddfb Mon Sep 17 00:00:00 2001 From: Pierre Rognant Date: Thu, 3 Sep 2020 15:54:19 +0200 Subject: [PATCH 1/3] Corrects collection loop period --- src/main/java/org/datadog/jmxfetch/App.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java index c573f0270..d9fe0c3c6 100644 --- a/src/main/java/org/datadog/jmxfetch/App.java +++ b/src/main/java/org/datadog/jmxfetch/App.java @@ -485,8 +485,8 @@ void start() { try { long loopPeriod = appConfig.getCheckPeriod(); long sleepPeriod = (duration > loopPeriod) ? loopPeriod : loopPeriod - duration; - log.debug("Sleeping for " + loopPeriod + " ms."); - Thread.sleep(loopPeriod); + log.debug("Sleeping for " + sleepPeriod + " ms."); + Thread.sleep(sleepPeriod); } catch (InterruptedException e) { log.warn(e.getMessage(), e); } From f9f830fe8c16620c1c9bb4d0565ef1a24068cfbc Mon Sep 17 00:00:00 2001 From: Pierre Rognant Date: Thu, 3 Sep 2020 22:16:17 +0200 Subject: [PATCH 2/3] no sleep when duration>loopPeriod + debug log --- src/main/java/org/datadog/jmxfetch/App.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java index d9fe0c3c6..d7bcc5e1a 100644 --- a/src/main/java/org/datadog/jmxfetch/App.java +++ b/src/main/java/org/datadog/jmxfetch/App.java @@ -484,9 +484,14 @@ void start() { // Sleep until next collection try { long loopPeriod = appConfig.getCheckPeriod(); - long sleepPeriod = (duration > loopPeriod) ? loopPeriod : loopPeriod - duration; - log.debug("Sleeping for " + sleepPeriod + " ms."); - Thread.sleep(sleepPeriod); + long sleepPeriod = loopPeriod - duration; + if (sleepPeriod <= 0) { + log.debug("The collection cycle took longer that the configured check period, the next cycle will start immediatly"); + } + else { + log.debug("Sleeping for " + sleepPeriod + " ms."); + Thread.sleep(sleepPeriod); + } } catch (InterruptedException e) { log.warn(e.getMessage(), e); } From dff1c0e9f305af249faa3b8b98ce6463ed7abc20 Mon Sep 17 00:00:00 2001 From: Pierre Rognant Date: Thu, 3 Sep 2020 22:26:21 +0200 Subject: [PATCH 3/3] Checkstyle --- src/main/java/org/datadog/jmxfetch/App.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java index d7bcc5e1a..b2b88011c 100644 --- a/src/main/java/org/datadog/jmxfetch/App.java +++ b/src/main/java/org/datadog/jmxfetch/App.java @@ -486,9 +486,10 @@ void start() { long loopPeriod = appConfig.getCheckPeriod(); long sleepPeriod = loopPeriod - duration; if (sleepPeriod <= 0) { - log.debug("The collection cycle took longer that the configured check period, the next cycle will start immediatly"); - } - else { + log.debug( + "The collection cycle took longer that the configured check period," + + " the next cycle will start immediatly"); + } else { log.debug("Sleeping for " + sleepPeriod + " ms."); Thread.sleep(sleepPeriod); }