remove references to ActiveSpan

5 files changed, 14 insertions, 14 deletions

diff --git a/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala
index ae0c7795..3d292134 100644
--- a/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala
@@ -1,8 +1,6 @@
 package kamon.trace
 
-import kamon.Kamon
 import kamon.Kamon.buildSpan
-import kamon.metric._
 import kamon.testkit.{MetricInspection, Reconfigure}
 import org.scalatest.{Matchers, WordSpecLike}
 
diff --git a/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala
index fb5bb313..b398ee98 100644
--- a/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/TracerSpec.scala
@@ -21,6 +21,7 @@ class TracerSpec extends WordSpec with Matchers with SpanBuilding with OptionVal
 
     "pass the operation name and tags to started Span" in {
       val span = tracer.buildSpan("myOperation")
+        .withTag("both", "both")
         .withMetricTag("metric-tag", "value")
         .withMetricTag("metric-tag", "value")
         .withSpanTag("hello", "world")
@@ -32,16 +33,18 @@ class TracerSpec extends WordSpec with Matchers with SpanBuilding with OptionVal
       val spanData = inspect(span)
       spanData.operationName() shouldBe "myOperation"
       spanData.metricTags() should contain only (
-        ("metric-tag" -> "value"))
+        ("metric-tag" -> "value"),
+        ("both" -> "both"))
 
       spanData.spanTags() should contain allOf(
+        ("both" -> TagValue.String("both")),
         ("hello" -> TagValue.String("world")),
         ("kamon" -> TagValue.String("rulez")),
         ("number" -> TagValue.Number(123)),
         ("boolean" -> TagValue.True))
     }
 
-    "not have any parent Span if there is ActiveSpan and no parent was explicitly given" in {
+    "not have any parent Span if there is no Span in the current context and no parent was explicitly given" in {
       val span = tracer.buildSpan("myOperation").start()
       val spanData = inspect(span)
       spanData.context().parentID shouldBe IdentityProvider.NoIdentifier
@@ -59,10 +62,10 @@ class TracerSpec extends WordSpec with Matchers with SpanBuilding with OptionVal
       parentData.context().spanID shouldBe childData.context().parentID
     }
 
-    "ignore the currently active span as parent if explicitly requested" in {
+    "ignore the span from the current context as parent if explicitly requested" in {
       val parent = tracer.buildSpan("myOperation").start()
       val child = Kamon.withContext(Context.create(Span.ContextKey, parent)) {
-        tracer.buildSpan("childOperation").ignoreActiveSpan().start()
+        tracer.buildSpan("childOperation").ignoreParentFromContext().start()
       }
 
       val childData = inspect(child)
diff --git a/kamon-core/src/main/scala/kamon/context/Mixin.scala b/kamon-core/src/main/scala/kamon/context/Mixin.scala
index 64e03748..3445cc31 100644
--- a/kamon-core/src/main/scala/kamon/context/Mixin.scala
+++ b/kamon-core/src/main/scala/kamon/context/Mixin.scala
@@ -19,7 +19,7 @@ import kamon.Kamon
 
 
 /**
-  * Utility trait that marks objects carrying a reference to a Span.
+  * Utility trait that marks objects carrying a reference to a Context instance.
   *
   */
 trait HasContext {
@@ -30,14 +30,14 @@ object HasContext {
   private case class Default(context: Context) extends HasContext
 
   /**
-    * Construct a HasSpan instance that references the provided Span.
+    * Construct a HasSpan instance that references the provided Context.
     *
     */
   def from(context: Context): HasContext =
     Default(context)
 
   /**
-    * Construct a HasSpan instance that references the currently ActiveSpan in Kamon's tracer.
+    * Construct a HasContext instance with the current Kamon from Kamon's default context storage.
     *
     */
   def fromCurrentContext(): HasContext =
diff --git a/kamon-core/src/main/scala/kamon/trace/Tracer.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
index 84cb1899..f2f1918c 100644
--- a/kamon-core/src/main/scala/kamon/trace/Tracer.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
@@ -93,7 +93,7 @@ object Tracer {
     private var startTimestamp = 0L
     private var initialSpanTags = Map.empty[String, Span.TagValue]
     private var initialMetricTags = Map.empty[String, String]
-    private var useActiveSpanAsParent = true
+    private var useParentFromContext = true
 
     def asChildOf(parent: Span): SpanBuilder = {
       if(parent != Span.Empty) this.parentSpan = parent
@@ -132,8 +132,8 @@ object Tracer {
       this
     }
 
-    def ignoreActiveSpan(): SpanBuilder = {
-      this.useActiveSpanAsParent = false
+    def ignoreParentFromContext(): SpanBuilder = {
+      this.useParentFromContext = false
       this
     }
 
@@ -141,7 +141,7 @@ object Tracer {
       val startTimestampMicros = if(startTimestamp != 0L) startTimestamp else Clock.microTimestamp()
 
       val parentSpan: Option[Span] = Option(this.parentSpan)
-        .orElse(if(useActiveSpanAsParent) Some(Kamon.currentContext().get(Span.ContextKey)) else None)
+        .orElse(if(useParentFromContext) Some(Kamon.currentContext().get(Span.ContextKey)) else None)
         .filter(span => span != Span.Empty)
 
       val nonRemoteParent = parentSpan.filter(s => s.isLocal() && s.nonEmpty())
diff --git a/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala b/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala
index 46012c0f..0ba61f87 100644
--- a/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/SpanInspector.scala
@@ -42,7 +42,6 @@ class SpanInspector(span: Span) {
 
 
   private def getField[T, R](target: Any, fieldName: String)(implicit classTag: ClassTag[T]): R = {
-    println("TRYING TO ACCESS: " + classTag.runtimeClass)
     val toFinishedSpanMethod = classTag.runtimeClass.getDeclaredField(fieldName)
     toFinishedSpanMethod.setAccessible(true)
     toFinishedSpanMethod.get(target).asInstanceOf[R]