From 003af1dd8ef1e3b4a8f1a9eff56a3c15c01cb2a9 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Mon, 27 Jan 2014 09:11:32 -0300 Subject: rename UOW to TraceToken and generate it by default when a Trace starts --- .../src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala | 2 +- .../kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala | 2 +- .../test/scala/kamon/trace/instrumentation/TraceContextFixture.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kamon-core/src/test/scala') 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 89742651..d6648cef 100644 --- a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala @@ -25,7 +25,7 @@ class ActorLoggingSpec extends TestKit(ActorSystem("actor-logging-spec")) with W "the ActorLogging instrumentation" should { "attach the TraceContext (if available) to log events" in { - val testTraceContext = Some(TraceContext(Actor.noSender, 1)) + val testTraceContext = Some(TraceContext(Actor.noSender, 1, "test", "test-1")) val loggerActor = system.actorOf(Props[LoggerActor]) system.eventStream.subscribe(testActor, classOf[LogEvent]) diff --git a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala index 89251bf4..f32623b9 100644 --- a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala @@ -67,7 +67,7 @@ class ActorMessagePassingTracingSpec extends TestKit(ActorSystem("actor-message- } trait TraceContextEchoFixture { - val testTraceContext = Some(Trace.newTraceContext("")) + val testTraceContext = Some(Trace.newTraceContext("test", "test-1")) val ctxEchoActor = system.actorOf(Props[TraceContextEcho]) } diff --git a/kamon-core/src/test/scala/kamon/trace/instrumentation/TraceContextFixture.scala b/kamon-core/src/test/scala/kamon/trace/instrumentation/TraceContextFixture.scala index 62f7ec84..2df95d09 100644 --- a/kamon-core/src/test/scala/kamon/trace/instrumentation/TraceContextFixture.scala +++ b/kamon-core/src/test/scala/kamon/trace/instrumentation/TraceContextFixture.scala @@ -6,5 +6,5 @@ import akka.actor.Actor trait TraceContextFixture { val random = new Random(System.nanoTime) - val testTraceContext = Some(TraceContext(Actor.noSender, random.nextInt)) + val testTraceContext = Some(TraceContext(Actor.noSender, random.nextInt, "test", "test-1")) } \ No newline at end of file -- cgit v1.2.3