From a04b30107fdf49556f5ca66204d90dcd0a1beeca Mon Sep 17 00:00:00 2001
From: Gary Huang <garyhuang@hotmail.ca>
Date: Fri, 7 Dec 2018 12:40:18 -0500
Subject: [PATCH] Change scope handling

---
 .../ratpack-1.4/src/test/groovy/RatpackTest.groovy  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy
index f4e88de0b9..3316d3e6b0 100644
--- a/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy
+++ b/dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/RatpackTest.groovy
@@ -4,6 +4,7 @@ import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.context.TraceScope
 import io.opentracing.Scope
+import io.opentracing.Span
 import io.opentracing.tag.Tags
 import io.opentracing.util.GlobalTracer
 import okhttp3.HttpUrl
@@ -314,18 +315,18 @@ class RatpackTest extends AgentTestRunner {
             GlobalTracer.get()
               .buildSpan("ratpack.exec-test")
               .withTag(DDTags.RESOURCE_NAME, "INSIDE-TEST")
-              .startActive(true)
+              .startActive(false)
 
           if (startSpanInHandler) {
             ((TraceScope) scope).setAsyncPropagation(true)
           }
           scope.span().setBaggageItem("test-baggage", "foo")
 
-          context.onClose {
-            if (startSpanInHandler) {
-              final Scope activeScope = GlobalTracer.get().scopeManager().active()
-              ((TraceScope) activeScope).setAsyncPropagation(false)
-              activeScope.close()
+          final Span startedSpan = startSpanInHandler ? scope.span() : null
+          if (startSpanInHandler) {
+            scope.close()
+            context.onClose {
+                startedSpan.finish()
             }
           }