Add check in ScheduledReporter's stop method

Refs #4246 Refs #4135
dropwizard · Oct 3, 2024 · 0b5cf55 · 0b5cf55
1 parent 17e6f52
commit 0b5cf55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/metrics-core/src/main/java/io/dropwizard/metrics5/ScheduledReporter.java b/metrics-core/src/main/java/io/dropwizard/metrics5/ScheduledReporter.java
@@ -220,10 +220,13 @@ public void stop() {
             executor.shutdown(); // Disable new tasks from being submitted
         }
 
-        try {
-            report(); // Report metrics one last time
-        } catch (Exception e) {
-            LOG.warn("Final reporting of metrics failed.", e);
+        if (this.scheduledFuture != null) {
+            // Reporter started, try to report metrics one last time
+            try {
+                report();
+            } catch (Exception e) {
+                LOG.warn("Final reporting of metrics failed.", e);
+            }
         }
 
         if (shutdownExecutorOnStop) {

diff --git a/metrics-graphite/src/test/java/io/dropwizard/metrics5/graphite/GraphiteReporterTest.java b/metrics-graphite/src/test/java/io/dropwizard/metrics5/graphite/GraphiteReporterTest.java
@@ -458,6 +458,7 @@ void closesConnectionIfGraphiteIsUnavailable() throws Exception {
 
     @Test
     void closesConnectionOnReporterStop() throws Exception {
+        reporter.start(1, TimeUnit.SECONDS);
         reporter.stop();
 
         final InOrder inOrder = inOrder(graphite);