Reverse the Stop order

grafana · May 24, 2023 · 134ce0f · 134ce0f
1 parent 30b995c
commit 134ce0f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/output/cloud/expv2/output.go b/output/cloud/expv2/output.go
@@ -101,12 +101,14 @@ func (o *Output) Start() error {
 // StopWithTestError gracefully stops all metric emission from the output.
 func (o *Output) StopWithTestError(testErr error) error {
 	o.logger.Debug("Stopping...")
+
 	close(o.stopMetricsCollection)
+	o.periodicCollector.Stop()
 
 	o.collector.SetNoDelayOnFlush()
-	o.periodicCollector.Stop()
-	o.periodicFlusher.Stop()
+	o.collector.CollectSamples(nil)
 
+	o.periodicFlusher.Stop()
 	o.logger.Debug("Stopped!")
 	return nil
 }