diff options
Diffstat (limited to 'kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala')
-rw-r--r-- | kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala index d6648cef..a0d8e933 100644 --- a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala @@ -18,24 +18,24 @@ package kamon.trace.instrumentation import akka.testkit.TestKit import org.scalatest.{ Inspectors, Matchers, WordSpecLike } import akka.actor.{ Props, ActorLogging, Actor, ActorSystem } -import akka.event.Logging.{ LogEvent } -import kamon.trace.{ ContextAware, TraceContext, Trace } +import akka.event.Logging.LogEvent +import kamon.trace.{TraceContextAware, TraceRecorder} class ActorLoggingSpec extends TestKit(ActorSystem("actor-logging-spec")) with WordSpecLike with Matchers with Inspectors { "the ActorLogging instrumentation" should { "attach the TraceContext (if available) to log events" in { - val testTraceContext = Some(TraceContext(Actor.noSender, 1, "test", "test-1")) val loggerActor = system.actorOf(Props[LoggerActor]) system.eventStream.subscribe(testActor, classOf[LogEvent]) - Trace.withContext(testTraceContext) { + val testTraceContext = TraceRecorder.withNewTraceContext("logging") { loggerActor ! "info" + TraceRecorder.currentContext } fishForMessage() { case event: LogEvent if event.message.toString contains "TraceContext =>" ⇒ - val ctxInEvent = event.asInstanceOf[ContextAware].traceContext + val ctxInEvent = event.asInstanceOf[TraceContextAware].traceContext ctxInEvent === testTraceContext case event: LogEvent ⇒ false @@ -46,6 +46,6 @@ class ActorLoggingSpec extends TestKit(ActorSystem("actor-logging-spec")) with W class LoggerActor extends Actor with ActorLogging { def receive = { - case "info" ⇒ log.info("TraceContext => {}", Trace.context()) + case "info" ⇒ log.info("TraceContext => {}", TraceRecorder.currentContext) } } |