open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure flush cannot happen after disruptor shutdown 

Otherwise flish event gets stuck in disruptor forever.
This commit is contained in:
Nikolay Martynov 2019-10-11 08:10:32 -04:00
parent 9ee74fb52f
commit 22e8887282
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
View File

@ -61,6 +61,7 @@ public class DDAgentWriter implements Writer {
private static final ThreadFactory SCHEDULED_FLUSH_THREAD_FACTORY = private static final ThreadFactory SCHEDULED_FLUSH_THREAD_FACTORY =
new DaemonThreadFactory("dd-trace-writer"); new DaemonThreadFactory("dd-trace-writer");
private final Runnable flushTask = new FlushTask();
private final DDApi api; private final DDApi api;
private final int flushFrequencySeconds; private final int flushFrequencySeconds;
private final Disruptor<Event<List<DDSpan>>> disruptor; private final Disruptor<Event<List<DDSpan>>> disruptor;
@ -135,9 +136,17 @@ public class DDAgentWriter implements Writer {
@Override @Override
public void close() { public void close() {
running = false; running = false;
// We have to shutdown scheduled executor first to make sure no flush events issued after
// disruptor has been shutdown.
// Otherwise those events will never be processed and flush call will wait forever.
scheduledWriterExecutor.shutdown();
try {
scheduledWriterExecutor.awaitTermination(flushFrequencySeconds, SECONDS);
} catch (final InterruptedException e) {
log.warn("Waiting for flush executor shutdown interrupted.", e);
}
flush(); flush();
disruptor.shutdown(); disruptor.shutdown();
scheduledWriterExecutor.shutdown();
} }
/** This method will block until the flush is complete. */ /** This method will block until the flush is complete. */
@ -170,8 +179,6 @@ public class DDAgentWriter implements Writer {
} }
} }
private final Runnable flushTask = new FlushTask();
private class FlushTask implements Runnable { private class FlushTask implements Runnable {
@Override @Override
public void run() { public void run() {