aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego Parra <diegolparra@gmail.com>2013-05-30 00:50:20 -0300
committerDiego Parra <diegolparra@gmail.com>2013-05-30 00:50:20 -0300
commit577a03219827889e31fedbe915f677060503cc2c (patch)
tree7416f808af2c11429c7334d1c08bebbccf049e77 /src
parentb4ae12153f7c971ef13c9048584fd0b611de5e2d (diff)
downloadKamon-577a03219827889e31fedbe915f677060503cc2c.tar.gz
Kamon-577a03219827889e31fedbe915f677060503cc2c.tar.bz2
Kamon-577a03219827889e31fedbe915f677060503cc2c.zip
add import
Diffstat (limited to 'src')
-rw-r--r--src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj2
-rw-r--r--src/main/scala/kamon/instrumentation/TraceContextHolder.scala7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj b/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
index 867ec372..5ae26d75 100644
--- a/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
+++ b/src/main/aspectj/kamon/instrumentation/PromiseCompletingRunnableInstrumentation.aj
@@ -1,6 +1,8 @@
package kamon.instrumentation;
import kamon.TraceContext;
+import scala.concurrent.impl.Future;
+import scala.Option;
privileged public aspect PromiseCompletingRunnableInstrumentation {
diff --git a/src/main/scala/kamon/instrumentation/TraceContextHolder.scala b/src/main/scala/kamon/instrumentation/TraceContextHolder.scala
index b44547dd..a9a66d63 100644
--- a/src/main/scala/kamon/instrumentation/TraceContextHolder.scala
+++ b/src/main/scala/kamon/instrumentation/TraceContextHolder.scala
@@ -1,8 +1,7 @@
package kamon.instrumentation;
-
-import kamon.TraceContext;
-import scala.Option;
+import kamon.TraceContext
+import scala.Option
class TraceContextHolder {
- final val context:Option[TraceContext] = TraceContext.current
+ val context:Option[TraceContext] = TraceContext.current
} \ No newline at end of file