Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void open(MetricConfig metricConfig) {
@Override
public void close() {
exporter.flush();
lastResult.join(1, TimeUnit.MINUTES);
waitForLastReportToComplete();
exporter.close();
}

Expand Down Expand Up @@ -268,4 +268,11 @@ public void report() {
exporter.getClass().getName());
}
}

@VisibleForTesting
void waitForLastReportToComplete() {
if (lastResult != null) {
lastResult.join(1, TimeUnit.MINUTES);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ public void testReport() throws Exception {
reporter.notifyOfAddedMetric(gauge, "foo.gauge", group);

reporter.report();
// Reporting is async, hence reports order is not deterministic.
// As test utils rely on verification of "last" report, we enforce report order
// for testing purposes.
reporter.waitForLastReportToComplete();

MeterView meter = new MeterView(counter);
reporter.notifyOfAddedMetric(meter, "foo.meter", group);
Expand Down