Skip to content

Commit 1725b85

Browse files
committed
fix(ot): Fix unit tests
1 parent d127624 commit 1725b85

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/OpenTracing31Test.groovy

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import datadog.trace.api.DDSpanId
33
import datadog.trace.api.DDTags
44
import datadog.trace.api.DDTraceId
55
import datadog.trace.api.interceptor.MutableSpan
6+
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
67
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities
78
import datadog.trace.core.propagation.PropagationTags
89
import datadog.trace.instrumentation.opentracing.DefaultLogHandler
@@ -154,24 +155,25 @@ class OpenTracing31Test extends AgentTestRunner {
154155

155156
def "test scopemanager"() {
156157
setup:
158+
AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer
157159
def span = tracer.buildSpan("some name").start()
158160
def scope = tracer.scopeManager().activate(span, finishSpan)
159-
setAsyncPropagation(false)
161+
internalTracer.setAsyncPropagation(false)
160162

161163
expect:
162164
span instanceof MutableSpan
163165
scope instanceof TraceScope
164-
!(scope as TraceScope).isAsyncPropagating()
166+
!internalTracer.isAsyncPropagation()
165167
(scope as TraceScope).capture() == null
166168
(tracer.scopeManager().active().span().delegate == span.delegate)
167169

168170
when:
169-
setAsyncPropagation(true)
171+
internalTracer.setAsyncPropagation(true)
170172
def continuation = (scope as TraceScope).capture()
171173
continuation.cancel()
172174

173175
then:
174-
(scope as TraceScope).isAsyncPropagating()
176+
internalTracer.isAsyncPropagation()
175177
continuation instanceof TraceScope.Continuation
176178

177179
when: "attempting to close the span this way doesn't work because we lost the 'finishSpan' reference"

dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/OpenTracing32Test.groovy

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import datadog.trace.api.DDSpanId
33
import datadog.trace.api.DDTags
44
import datadog.trace.api.DDTraceId
55
import datadog.trace.api.interceptor.MutableSpan
6+
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
67
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities
78
import datadog.trace.context.TraceScope
89
import datadog.trace.core.DDSpan
@@ -164,24 +165,25 @@ class OpenTracing32Test extends AgentTestRunner {
164165

165166
def "test scopemanager"() {
166167
setup:
168+
AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer
167169
def span = tracer.buildSpan("some name").start()
168170
def scope = tracer.scopeManager().activate(span, finishSpan)
169-
setAsyncPropagation(false)
171+
internalTracer.setAsyncPropagation(false)
170172

171173
expect:
172174
span instanceof MutableSpan
173175
scope instanceof TraceScope
174-
!(scope as TraceScope).isAsyncPropagating()
176+
!internalTracer.isAsyncPropagation()
175177
(scope as TraceScope).capture() == null
176178
(tracer.scopeManager().active().span().delegate == span.delegate)
177179

178180
when:
179-
setAsyncPropagation(true)
181+
internalTracer.setAsyncPropagation(true)
180182
def continuation = (scope as TraceScope).capture()
181183
continuation.cancel()
182184

183185
then:
184-
(scope as TraceScope).isAsyncPropagating()
186+
internalTracer.isAsyncPropagation()
185187
continuation instanceof TraceScope.Continuation
186188

187189
when: "attempting to close the span this way doesn't work because we lost the 'finishSpan' reference"

0 commit comments

Comments
 (0)