aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/test
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-01-27 09:11:32 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-01-27 09:11:32 -0300
commit633b4058207d084724743c6b6367ac60f95ff987 (patch)
treea0ea788593b93b2657e1924e578ff274aab3eeee /kamon-core/src/test
parentf341a9f01aa53bb79dbbc8a2cccd652c03ae5267 (diff)
downloadKamon-633b4058207d084724743c6b6367ac60f95ff987.tar.gz
Kamon-633b4058207d084724743c6b6367ac60f95ff987.tar.bz2
Kamon-633b4058207d084724743c6b6367ac60f95ff987.zip
rename UOW to TraceToken and generate it by default when a Trace starts
Diffstat (limited to 'kamon-core/src/test')
-rw-r--r--kamon-core/src/test/scala/kamon/trace/instrumentation/ActorLoggingSpec.scala2
-rw-r--r--kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala2
-rw-r--r--kamon-core/src/test/scala/kamon/trace/instrumentation/TraceContextFixture.scala2
3 files changed, 3 insertions, 3 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 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