1 files changed, 8 insertions, 11 deletions
diff --git a/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj b/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
index bd2a4d47..867ec372 100644
--- a/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
+++ b/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
@@ -1,29 +1,26 @@
 package kamon.instrumentation;
 
 import kamon.TraceContext;
-import scala.concurrent.impl.Future;
-import scala.Option;
 
 privileged public aspect PromiseCompletingRunnableInstrumentation {
 
     declare parents : Future.PromiseCompletingRunnable extends TraceContextHolder;
 
-
-    pointcut run(Future.PromiseCompletingRunnable runnable)
+    pointcut run(scala.concurrent.impl.Future.PromiseCompletingRunnable runnable)
             : execution(* scala.concurrent.impl.Future.PromiseCompletingRunnable.run()) && this(runnable);
 
-    void around(TraceContextHolder runnable)
+    void around(Object runnable)
         : run(runnable) {
 
-        if(runnable.getContext().isDefined()) {
-            System.out.println("########################################################3 There is some context");
-            TraceContext.set(runnable.getContext().get());
-            proceed(runnable);
+        TraceContextHolder contextHolder = (TraceContextHolder) runnable;
+
+        if(contextHolder.context().isDefined()) {
+            TraceContext.set(contextHolder.context().get());
+            proceed(contextHolder);
             TraceContext.clear();
 
         } else {
-            System.out.println("########################################################3 There is NOOOOO context");
-            proceed(runnable);
+            proceed(contextHolder);
         }
     }
 }