Fix span management

lucidsoftware · Feb 25, 2017 · 6b9beb2 · 6b9beb2
1 parent a8c505b
commit 6b9beb2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/play-active/src/main/scala/io/opentracing/play/active/ActiveTracingFilter.scala b/play-active/src/main/scala/io/opentracing/play/active/ActiveTracingFilter.scala
@@ -11,15 +11,16 @@ class ActiveTracingFilter(taggers: Traversable[SpanTagger]) extends BaseTracingF
   protected[this] def tracer = GlobalTracer.get
 
   override def apply(next: EssentialAction) = EssentialAction { request =>
-    val oldManagedSpan = DefaultSpanManager.getInstance.currentSpan()
     val span = spanBuilder(request).start()
     val managedSpan = DefaultSpanManager.getInstance.manage(span)
-    next(request).map { result =>
-      taggers.foreach(_.tag(span, request, result))
-      span.finish()
+    try {
+      next(request).map { result =>
+        taggers.foreach(_.tag(span, request, result))
+        span.finish()
+        result
+      }
+    } finally {
       managedSpan.release()
-      DefaultSpanManager.getInstance().manage(oldManagedSpan)
-      result
     }
   }
 }