aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/trace/Tracer.scala
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-07-30 11:25:11 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-07-30 11:25:11 +0200
commit18b9fc25d556fef50c5033f8880fab2594783caa (patch)
treef9357c04000adb4ee06efb1cc2d3418f7a8d9310 /kamon-core/src/main/scala/kamon/trace/Tracer.scala
parent0930e36def6ce62c55d30d744b41ef475374a541 (diff)
downloadKamon-18b9fc25d556fef50c5033f8880fab2594783caa.tar.gz
Kamon-18b9fc25d556fef50c5033f8880fab2594783caa.tar.bz2
Kamon-18b9fc25d556fef50c5033f8880fab2594783caa.zip
rename ActiveSpanSource into ActiveSpanStorage
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/Tracer.scala')
-rw-r--r--kamon-core/src/main/scala/kamon/trace/Tracer.scala7
1 files changed, 2 insertions, 5 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Tracer.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
index 737a8b8d..bfdd561d 100644
--- a/kamon-core/src/main/scala/kamon/trace/Tracer.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory
import scala.collection.immutable
import scala.util.Try
-trait Tracer extends ActiveSpanSource {
+trait Tracer extends ActiveSpanStorage {
def buildSpan(operationName: String): SpanBuilder
def extract[C](format: SpanContextCodec.Format[C], carrier: C): Option[SpanContext]
@@ -41,7 +41,7 @@ object Tracer {
final class Default(metrics: MetricLookup, reporterRegistry: ReporterRegistryImpl, initialConfig: Config) extends Tracer {
private val logger = LoggerFactory.getLogger(classOf[Tracer])
- private val activeSpanSource = ActiveSpanSource.ThreadLocalBased()
+ private val activeSpanSource = ActiveSpanStorage.ThreadLocal()
private[Tracer] val tracerMetrics = new TracerMetrics(metrics)
@volatile private[Tracer] var joinRemoteParentsWithSameSpanID: Boolean = true
@@ -79,9 +79,6 @@ object Tracer {
override def activate(span: Span): Scope =
activeSpanSource.activate(span)
- override def activate(span: Span, finishOnClose: Boolean): Scope =
- activeSpanSource.activate(span, finishOnClose)
-
def sampler: Sampler =
configuredSampler