fixed the instrumentation to work nicely with spray

2 files changed, 5 insertions, 5 deletions

diff --git a/kamon-uow/src/main/scala/kamon/logging/UowActorLogging.scala b/kamon-uow/src/main/scala/kamon/logging/UowActorLogging.scala
index e117db1b..2347bbe9 100644
--- a/kamon-uow/src/main/scala/kamon/logging/UowActorLogging.scala
+++ b/kamon-uow/src/main/scala/kamon/logging/UowActorLogging.scala
@@ -1,13 +1,13 @@
 package kamon.logging
 
 import akka.actor.Actor
-import kamon.Kamon
+import kamon.{Tracer, Kamon}
 
 trait UowActorLogging {
   self: Actor =>
 
   def logWithUOW(text: String) = {
-    val uow = Kamon.context.map(_.userContext).getOrElse("NA")
+    val uow = Tracer.context.map(_.userContext).getOrElse("NA")
     println(s"=======>[$uow] - $text")
   }
 
diff --git a/kamon-uow/src/main/scala/kamon/logging/UowDirectives.scala b/kamon-uow/src/main/scala/kamon/logging/UowDirectives.scala
index e79602ea..58473f13 100644
--- a/kamon-uow/src/main/scala/kamon/logging/UowDirectives.scala
+++ b/kamon-uow/src/main/scala/kamon/logging/UowDirectives.scala
@@ -5,13 +5,13 @@ import spray.routing.Directive0
 import spray.routing.directives.BasicDirectives
 import java.net.InetAddress
 import scala.util.Try
-import kamon.Kamon
+import kamon.{Tracer, Kamon}
 
 trait UowDirectives extends BasicDirectives {
   def uow: Directive0 = mapRequest { request =>
     val generatedUow = Some(UowDirectives.newUow)
     println("Generated UOW: "+generatedUow)
-    Kamon.set(Kamon.newTraceContext().copy(userContext = generatedUow))
+    Tracer.set(Tracer.newTraceContext().copy(userContext = generatedUow))
 
 
     request
@@ -21,7 +21,7 @@ trait UowDirectives extends BasicDirectives {
 object UowDirectives {
   val uowCounter = new AtomicLong
 
-  val hostnamePrefix = Try(InetAddress.getLocalHost.getHostName.toString).getOrElse("unknown-localhost")
+  val hostnamePrefix = Try(InetAddress.getLocalHost.getHostName).getOrElse("unknown-localhost")
 
   def newUow = "%s-%s".format(hostnamePrefix, uowCounter.incrementAndGet())