From 46106fff8386b0094bd634c0760092510a7a65bb Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Fri, 17 Apr 2015 19:11:41 +0200 Subject: = core: add commodity trace context manipulation methods to the Tracer. --- kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'kamon-core/src/test/scala/kamon/testkit') diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala index e7b18770..cb909ad9 100644 --- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala +++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala @@ -20,13 +20,11 @@ import akka.testkit.{ ImplicitSender, TestKitBase } import akka.actor.ActorSystem import com.typesafe.config.{ Config, ConfigFactory } import kamon.Kamon -import kamon.metric.{ Entity, SubscriptionsDispatcher, EntitySnapshot, MetricsImpl } +import kamon.metric.{ Entity, SubscriptionsDispatcher, EntitySnapshot } import kamon.trace.TraceContext import kamon.util.LazyActorRef import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } -import scala.reflect.ClassTag - abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll { lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext implicit lazy val system: ActorSystem = { @@ -41,7 +39,7 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W Kamon.tracer.newContext(name) def newContext(name: String, token: String): TraceContext = - Kamon.tracer.newContext(name, token) + Kamon.tracer.newContext(name, Option(token)) def takeSnapshotOf(name: String, category: String): EntitySnapshot = { val recorder = Kamon.metrics.find(name, category).get -- cgit v1.2.3