From 296916a39360e93d8ffd9dc1d08a7c68b7bcb0ca Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 18 Oct 2019 11:24:33 -0700 Subject: [PATCH] Avoid submitting a job if executor is shutdown MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s still a possiblilty of a race condition and we could catch and handle the exception, but this should reduce the noise a bit. --- .../main/java/datadog/trace/common/writer/DDAgentWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java index 434f6feeb6..1fe009c2b7 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java @@ -171,7 +171,7 @@ public class DDAgentWriter implements Writer { } private void scheduleFlush() { - if (flushFrequencySeconds > 0) { + if (flushFrequencySeconds > 0 && !scheduledWriterExecutor.isShutdown()) { final ScheduledFuture previous = flushSchedule.getAndSet( scheduledWriterExecutor.schedule(flushTask, flushFrequencySeconds, SECONDS));