Skip to content

Commit 9d49330

Browse files
author
Andrew Kent
committed
Fix flickering PendingTraceTest
1 parent a6b2e1f commit 9d49330

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

dd-trace-ot/src/test/groovy/datadog/opentracing/PendingTraceTest.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import datadog.trace.agent.test.TestUtils
44
import datadog.trace.common.writer.ListWriter
55
import spock.lang.Specification
66
import spock.lang.Subject
7+
import spock.lang.Timeout
78

89
import java.lang.ref.WeakReference
910
import java.util.concurrent.TimeUnit
@@ -94,6 +95,7 @@ class PendingTraceTest extends Specification {
9495
traceCount.get() == 1
9596
}
9697

98+
@Timeout(value = 60, unit = TimeUnit.SECONDS)
9799
def "trace does not report when unfinished child discarded"() {
98100
when:
99101
def child = tracer.buildSpan("child").asChildOf(rootSpan).start()
@@ -109,7 +111,8 @@ class PendingTraceTest extends Specification {
109111
def childRef = new WeakReference<>(child)
110112
child = null
111113
TestUtils.awaitGC(childRef)
112-
while (trace.clean()) {
114+
while (trace.pendingReferenceCount.get() > 0) {
115+
trace.clean()
113116
}
114117

115118
then:

0 commit comments

Comments
 (0)