! core: move the TraceContext manipulation API to the Tracer companion object.

3 files changed, 37 insertions, 37 deletions

diff --git a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
index 1d270106..c8f1ebf6 100644
--- a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
@@ -42,10 +42,10 @@ class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") {
     "send a TraceInfo when the trace has finished and all segments are finished" in {
       Kamon.tracer.subscribe(testActor)
 
-      TraceContext.withContext(newContext("simple-trace-without-segments")) {
-        TraceContext.currentContext.startSegment("segment-one", "test-segment", "test").finish()
-        TraceContext.currentContext.startSegment("segment-two", "test-segment", "test").finish()
-        TraceContext.currentContext.finish()
+      Tracer.withContext(newContext("simple-trace-without-segments")) {
+        Tracer.currentContext.startSegment("segment-one", "test-segment", "test").finish()
+        Tracer.currentContext.startSegment("segment-two", "test-segment", "test").finish()
+        Tracer.currentContext.finish()
       }
 
       val traceInfo = expectMsgType[TraceInfo]
@@ -60,10 +60,10 @@ class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") {
     "incubate the tracing context if there are open segments after finishing" in {
       Kamon.tracer.subscribe(testActor)
 
-      val secondSegment = TraceContext.withContext(newContext("simple-trace-without-segments")) {
-        TraceContext.currentContext.startSegment("segment-one", "test-segment", "test").finish()
-        val segment = TraceContext.currentContext.startSegment("segment-two", "test-segment", "test")
-        TraceContext.currentContext.finish()
+      val secondSegment = Tracer.withContext(newContext("simple-trace-without-segments")) {
+        Tracer.currentContext.startSegment("segment-one", "test-segment", "test").finish()
+        val segment = Tracer.currentContext.startSegment("segment-two", "test-segment", "test")
+        Tracer.currentContext.finish()
         segment
       }
 
diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
index d7cb7ea3..46620461 100644
--- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
@@ -37,22 +37,22 @@ class TraceContextManipulationSpec extends BaseKamonSpec("trace-metrics-spec") {
 
   "the TraceContext api" should {
     "allow starting a trace within a specified block of code, and only within that block of code" in {
-      val createdContext = TraceContext.withContext(newContext("start-context")) {
-        TraceContext.currentContext should not be empty
-        TraceContext.currentContext
+      val createdContext = Tracer.withContext(newContext("start-context")) {
+        Tracer.currentContext should not be empty
+        Tracer.currentContext
       }
 
-      TraceContext.currentContext shouldBe empty
+      Tracer.currentContext shouldBe empty
       createdContext.name shouldBe ("start-context")
     }
 
     "allow starting a trace within a specified block of code, providing a trace-token and only within that block of code" in {
-      val createdContext = TraceContext.withContext(newContext("start-context-with-token", "token-1")) {
-        TraceContext.currentContext should not be empty
-        TraceContext.currentContext
+      val createdContext = Tracer.withContext(newContext("start-context-with-token", "token-1")) {
+        Tracer.currentContext should not be empty
+        Tracer.currentContext
       }
 
-      TraceContext.currentContext shouldBe empty
+      Tracer.currentContext shouldBe empty
       createdContext.name shouldBe ("start-context-with-token")
       createdContext.token should be("token-1")
     }
@@ -60,37 +60,37 @@ class TraceContextManipulationSpec extends BaseKamonSpec("trace-metrics-spec") {
     "allow providing a TraceContext and make it available within a block of code" in {
       val createdContext = newContext("manually-provided-trace-context")
 
-      TraceContext.currentContext shouldBe empty
-      TraceContext.withContext(createdContext) {
-        TraceContext.currentContext should be(createdContext)
+      Tracer.currentContext shouldBe empty
+      Tracer.withContext(createdContext) {
+        Tracer.currentContext should be(createdContext)
       }
 
-      TraceContext.currentContext shouldBe empty
+      Tracer.currentContext shouldBe empty
     }
 
     "allow renaming a trace" in {
-      val createdContext = TraceContext.withContext(newContext("trace-before-rename")) {
-        TraceContext.currentContext.rename("renamed-trace")
-        TraceContext.currentContext
+      val createdContext = Tracer.withContext(newContext("trace-before-rename")) {
+        Tracer.currentContext.rename("renamed-trace")
+        Tracer.currentContext
       }
 
-      TraceContext.currentContext shouldBe empty
+      Tracer.currentContext shouldBe empty
       createdContext.name shouldBe ("renamed-trace")
     }
 
     "allow creating a segment within a trace" in {
-      val createdContext = TraceContext.withContext(newContext("trace-with-segments")) {
-        val segment = TraceContext.currentContext.startSegment("segment-1", "segment-1-category", "segment-library")
-        TraceContext.currentContext
+      val createdContext = Tracer.withContext(newContext("trace-with-segments")) {
+        val segment = Tracer.currentContext.startSegment("segment-1", "segment-1-category", "segment-library")
+        Tracer.currentContext
       }
 
-      TraceContext.currentContext shouldBe empty
+      Tracer.currentContext shouldBe empty
       createdContext.name shouldBe ("trace-with-segments")
     }
 
     "allow renaming a segment" in {
-      TraceContext.withContext(newContext("trace-with-renamed-segment")) {
-        val segment = TraceContext.currentContext.startSegment("original-segment-name", "segment-label", "segment-library")
+      Tracer.withContext(newContext("trace-with-renamed-segment")) {
+        val segment = Tracer.currentContext.startSegment("original-segment-name", "segment-label", "segment-library")
         segment.name should be("original-segment-name")
 
         segment.rename("new-segment-name")
diff --git a/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
index 8bacca83..b58b247f 100644
--- a/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/TraceLocalSpec.scala
@@ -30,7 +30,7 @@ class TraceLocalSpec extends BaseKamonSpec("trace-local-spec") with PatienceConf
 
   "the TraceLocal storage" should {
     "allow storing and retrieving values" in {
-      TraceContext.withContext(newContext("store-and-retrieve-trace-local")) {
+      Tracer.withContext(newContext("store-and-retrieve-trace-local")) {
         val testString = "Hello World"
 
         TraceLocal.store(SampleTraceLocalKey)(testString)
@@ -39,7 +39,7 @@ class TraceLocalSpec extends BaseKamonSpec("trace-local-spec") with PatienceConf
     }
 
     "return None when retrieving a non existent key" in {
-      TraceContext.withContext(newContext("non-existent-key")) {
+      Tracer.withContext(newContext("non-existent-key")) {
         TraceLocal.retrieve(SampleTraceLocalKey) should equal(None)
       }
     }
@@ -50,22 +50,22 @@ class TraceLocalSpec extends BaseKamonSpec("trace-local-spec") with PatienceConf
 
     "be attached to the TraceContext when it is propagated" in {
       val testString = "Hello World"
-      val testContext = TraceContext.withContext(newContext("manually-propagated-trace-local")) {
+      val testContext = Tracer.withContext(newContext("manually-propagated-trace-local")) {
         TraceLocal.store(SampleTraceLocalKey)(testString)
         TraceLocal.retrieve(SampleTraceLocalKey).value should equal(testString)
-        TraceContext.currentContext
+        Tracer.currentContext
       }
 
       /** No TraceLocal should be available here */
       TraceLocal.retrieve(SampleTraceLocalKey) should equal(None)
 
-      TraceContext.withContext(testContext) {
+      Tracer.withContext(testContext) {
         TraceLocal.retrieve(SampleTraceLocalKey).value should equal(testString)
       }
     }
 
     "allow retrieve a value from the MDC when was created a key with AvailableToMdc(cool-key)" in {
-      TraceContext.withContext(newContext("store-and-retrieve-trace-local-and-copy-to-mdc")) {
+      Tracer.withContext(newContext("store-and-retrieve-trace-local-and-copy-to-mdc")) {
         val testString = "Hello MDC"
 
         TraceLocal.store(SampleTraceLocalKeyAvailableToMDC)(testString)
@@ -78,7 +78,7 @@ class TraceLocalSpec extends BaseKamonSpec("trace-local-spec") with PatienceConf
     }
 
     "allow retrieve a value from the MDC when was created a key with AvailableToMdc.storeForMdc(String, String)" in {
-      TraceContext.withContext(newContext("store-and-retrieve-trace-local-and-copy-to-mdc")) {
+      Tracer.withContext(newContext("store-and-retrieve-trace-local-and-copy-to-mdc")) {
         val testString = "Hello MDC"
 
         TraceLocal.storeForMdc("someKey", testString)