aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/trace
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-06-11 18:30:34 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-06-11 18:30:34 +0200
commitd9636988cd8acf789bf17bfd06407a6b5c15985b (patch)
treeb3b9b0ff23bf221942f6f9607be2ab4b95d08188 /kamon-core/src/main/scala/kamon/trace
parent8b6dc987c498823169012125a58a92736dcd2a49 (diff)
downloadKamon-d9636988cd8acf789bf17bfd06407a6b5c15985b.tar.gz
Kamon-d9636988cd8acf789bf17bfd06407a6b5c15985b.tar.bz2
Kamon-d9636988cd8acf789bf17bfd06407a6b5c15985b.zip
crossbuilding for all supported Scala versions
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace')
-rw-r--r--kamon-core/src/main/scala/kamon/trace/SpanContextCodec.scala2
-rw-r--r--kamon-core/src/main/scala/kamon/trace/Tracer.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/SpanContextCodec.scala b/kamon-core/src/main/scala/kamon/trace/SpanContextCodec.scala
index eba5fd5f..8e3a446b 100644
--- a/kamon-core/src/main/scala/kamon/trace/SpanContextCodec.scala
+++ b/kamon-core/src/main/scala/kamon/trace/SpanContextCodec.scala
@@ -17,12 +17,12 @@
package kamon.trace
import java.net.{URLDecoder, URLEncoder}
+import java.util.concurrent.ThreadLocalRandom
import scala.collection.JavaConverters._
import io.opentracing.propagation.TextMap
import kamon.util.HexCodec
-import scala.concurrent.forkjoin.ThreadLocalRandom
trait SpanContextCodec[T] {
def inject(spanContext: SpanContext, carrier: T): Unit
diff --git a/kamon-core/src/main/scala/kamon/trace/Tracer.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
index f8af39a5..b4ec936f 100644
--- a/kamon-core/src/main/scala/kamon/trace/Tracer.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
@@ -19,19 +19,19 @@ package kamon.trace
import java.util.concurrent.ThreadLocalRandom
import com.typesafe.config.Config
-import com.typesafe.scalalogging.Logger
import io.opentracing.propagation.{Format, TextMap}
import io.opentracing.propagation.Format.Builtin.{BINARY, HTTP_HEADERS, TEXT_MAP}
import io.opentracing.util.ThreadLocalActiveSpanSource
import kamon.ReporterRegistryImpl
import kamon.metric.MetricLookup
import kamon.util.Clock
+import org.slf4j.LoggerFactory
class Tracer(metrics: MetricLookup, reporterRegistry: ReporterRegistryImpl, initialConfig: Config)
extends ThreadLocalActiveSpanSource with io.opentracing.Tracer {
- private val logger = Logger(classOf[Tracer])
+ private val logger = LoggerFactory.getLogger(classOf[Tracer])
private val tracerMetrics = new TracerMetrics(metrics)
@volatile private var configuredSampler: Sampler = Sampler.never