Fix remove PendingTrace from span cleaner bug

Andrew Kent · Andrew Kent · commit e0837efb5b37 · 2018-08-27T10:58:07.000-07:00
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java b/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java
@@ -205,6 +205,7 @@ public synchronized boolean clean() {
     while ((ref = referenceQueue.poll()) != null) {
       weakReferences.remove(ref);
       if (isWritten.compareAndSet(false, true)) {
+        SPAN_CLEANER.pendingTraces.remove(this);
         // preserve throughput count.
         // Don't report the trace because the data comes from buggy uses of the api and is suspect.
         tracer.incrementTraceCount();
diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/PendingTraceTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/PendingTraceTest.groovy
@@ -121,6 +121,7 @@ class PendingTraceTest extends Specification {
     trace.asList() == [rootSpan]
     writer == []
     traceCount.get() == 1
+    !PendingTrace.SPAN_CLEANER.pendingTraces.contains(trace)
   }
 
   def "add unfinished span to trace fails"() {

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ class PendingTraceTest extends Specification {`
`121`	`121`	`trace.asList() == [rootSpan]`
`122`	`122`	`writer == []`
`123`	`123`	`traceCount.get() == 1`
	`124`	`+ !PendingTrace.SPAN_CLEANER.pendingTraces.contains(trace)`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`def "add unfinished span to trace fails"() {`