fix context closing, we were calling Kamon.storeContext but not closing

the resulting scope
jtjeferreira · Mar 13, 2018 · e37aafc · e37aafc
1 parent c63fa49
commit e37aafc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/scala/reactivemongo/kamon/instrumentation/Instrumentation.scala b/src/main/scala/reactivemongo/kamon/instrumentation/Instrumentation.scala
@@ -106,10 +106,10 @@ class Instrumentation {
         .customize(clientSpanBuilder)
         .start()
 
-      val newContext = currentContext.withKey(Span.ContextKey, clientRequestSpan)
-      Kamon.storeContext(newContext) //storing the current context is important so that in other instrumentations the current Span is correct
-
-      val responseFuture = pjp.proceed().asInstanceOf[Future[_]]
+      //storing the current context is important so that in other instrumentations the current Span is correct
+      val responseFuture = Kamon.withContext(currentContext.withKey(Span.ContextKey, clientRequestSpan)) {
+        pjp.proceed().asInstanceOf[Future[_]]
+      }
 
       responseFuture.transform(
         s = response => {