From 8b6dc987c498823169012125a58a92736dcd2a49 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 11 Jun 2017 18:18:04 +0200 Subject: expose the tracer on the Kamon companion object --- kamon-core/src/main/scala/kamon/Kamon.scala | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'kamon-core/src/main') diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index f58f056e..c2ee0b1e 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -33,8 +33,8 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac private val metricRegistry = new MetricRegistry(initialConfig) private val reporterRegistry = new ReporterRegistryImpl(metricRegistry, initialConfig) - private val tracer = new Tracer(Kamon, reporterRegistry, initialConfig) private val env = new AtomicReference[Environment](Environment.fromConfig(ConfigFactory.load())) + private val kamonTracer = new Tracer(Kamon, reporterRegistry, initialConfig) def environment: Environment = env.get() @@ -60,21 +60,23 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac metricRegistry.minMaxCounter(name, unit, dynamicRange, sampleInterval) + def tracer: Tracer = + kamonTracer override def buildSpan(operationName: String): io.opentracing.Tracer.SpanBuilder = - tracer.buildSpan(operationName) + kamonTracer.buildSpan(operationName) override def extract[C](format: Format[C], carrier: C): SpanContext = - tracer.extract(format, carrier) + kamonTracer.extract(format, carrier) override def inject[C](spanContext: SpanContext, format: Format[C], carrier: C): Unit = - tracer.inject(spanContext, format, carrier) + kamonTracer.inject(spanContext, format, carrier) override def activeSpan(): ActiveSpan = - tracer.activeSpan() + kamonTracer.activeSpan() override def makeActive(span: Span): ActiveSpan = - tracer.makeActive(span) + kamonTracer.makeActive(span) -- cgit v1.2.3