fix(ot): Fix unit tests

Author: PerfectSlayer

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

@@ -3,6 +3,7 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.interceptor.MutableSpan
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities
 import datadog.trace.core.propagation.PropagationTags
 import datadog.trace.instrumentation.opentracing.DefaultLogHandler
@@ -154,24 +155,25 @@ class OpenTracing31Test extends AgentTestRunner {
 
   def "test scopemanager"() {
     setup:
+    AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer
     def span = tracer.buildSpan("some name").start()
     def scope = tracer.scopeManager().activate(span, finishSpan)
-    setAsyncPropagation(false)
+    internalTracer.setAsyncPropagation(false)
 
     expect:
     span instanceof MutableSpan
     scope instanceof TraceScope
-    !(scope as TraceScope).isAsyncPropagating()
+    !internalTracer.isAsyncPropagation()
     (scope as TraceScope).capture() == null
     (tracer.scopeManager().active().span().delegate == span.delegate)
 
     when:
-    setAsyncPropagation(true)
+    internalTracer.setAsyncPropagation(true)
     def continuation = (scope as TraceScope).capture()
     continuation.cancel()
 
     then:
-    (scope as TraceScope).isAsyncPropagating()
+    internalTracer.isAsyncPropagation()
     continuation instanceof TraceScope.Continuation
 
     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

@@ -3,6 +3,7 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTags
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.interceptor.MutableSpan
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities
 import datadog.trace.context.TraceScope
 import datadog.trace.core.DDSpan
@@ -164,24 +165,25 @@ class OpenTracing32Test extends AgentTestRunner {
 
   def "test scopemanager"() {
     setup:
+    AgentTracer.TracerAPI internalTracer = tracer.tracer.tracer
     def span = tracer.buildSpan("some name").start()
     def scope = tracer.scopeManager().activate(span, finishSpan)
-    setAsyncPropagation(false)
+    internalTracer.setAsyncPropagation(false)
 
     expect:
     span instanceof MutableSpan
     scope instanceof TraceScope
-    !(scope as TraceScope).isAsyncPropagating()
+    !internalTracer.isAsyncPropagation()
     (scope as TraceScope).capture() == null
     (tracer.scopeManager().active().span().delegate == span.delegate)
 
     when:
-    setAsyncPropagation(true)
+    internalTracer.setAsyncPropagation(true)
     def continuation = (scope as TraceScope).capture()
     continuation.cancel()
 
     then:
-    (scope as TraceScope).isAsyncPropagating()
+    internalTracer.isAsyncPropagation()
     continuation instanceof TraceScope.Continuation
 
     when: "attempting to close the span this way doesn't work because we lost the 'finishSpan' reference"

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

@@ -5,7 +5,9 @@ import datadog.trace.api.config.TracerConfig
 import datadog.trace.api.interceptor.MutableSpan
 import datadog.trace.api.interceptor.TraceInterceptor
 import datadog.trace.api.scopemanager.ScopeListener
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.common.writer.ListWriter
+import datadog.trace.context.TraceScope
 import datadog.trace.test.util.DDSpecification
 import io.opentracing.Scope
 import io.opentracing.Span
@@ -219,6 +221,102 @@ class OpenTracingAPITest extends DDSpecification {
     }
   }
 
+  def "span with async propagation"() {
+    setup:
+    AgentTracer.TracerAPI internalTracer = tracer.tracer
+
+    when:
+    Scope scope = tracer.buildSpan("someOperation")
+      .withTag(DDTags.SERVICE_NAME, "someService")
+      .startActive(true)
+    internalTracer.setAsyncPropagation(false)
+
+    then:
+    scope instanceof TraceScope
+    !internalTracer.isAsyncPropagation()
+
+    when:
+    internalTracer.setAsyncPropagation(true)
+    TraceScope.Continuation continuation = ((TraceScope) scope).capture()
+
+    then:
+    internalTracer.isAsyncPropagation()
+    continuation != null
+
+    when:
+    continuation.cancel()
+    scope.close()
+    writer.waitForTraces(1)
+
+    then:
+    1 * traceInterceptor.onTraceComplete({ it.size() == 1 }) >> { args -> args[0] }
+
+    assertTraces(writer, 1) {
+      trace(1) {
+        span {
+          serviceName "someService"
+          operationName "someOperation"
+          resourceName "someOperation"
+          tags {
+            defaultTags()
+          }
+        }
+      }
+    }
+  }
+
+  def "span inherits async propagation"() {
+    setup:
+    AgentTracer.TracerAPI internalTracer = tracer.tracer
+
+    when:
+    Scope outer = tracer.buildSpan("someOperation")
+      .withTag(DDTags.SERVICE_NAME, "someService")
+      .startActive(true)
+    internalTracer.setAsyncPropagation(false)
+
+    then:
+    !internalTracer.isAsyncPropagation()
+
+    when:
+    internalTracer.setAsyncPropagation(true)
+    Scope inner = tracer.buildSpan("otherOperation")
+      .withTag(DDTags.SERVICE_NAME, "otherService")
+      .startActive(true)
+
+    then:
+    internalTracer.isAsyncPropagation()
+
+    when:
+    inner.close()
+    outer.close()
+    writer.waitForTraces(1)
+
+    then:
+    1 * traceInterceptor.onTraceComplete({ it.size() == 2 }) >> { args -> args[0] }
+
+    assertTraces(writer, 1) {
+      trace(2) {
+        span {
+          serviceName "someService"
+          operationName "someOperation"
+          resourceName "someOperation"
+          tags {
+            defaultTags()
+          }
+        }
+        span {
+          serviceName "otherService"
+          operationName "otherOperation"
+          resourceName "otherOperation"
+          tags {
+            defaultTags()
+          }
+        }
+      }
+    }
+  }
+
   def "SpanContext ids equal tracer ids"() {
     when:
     Span testSpan = tracer.buildSpan("someOperation")