diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-06 14:15:15 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-06 14:15:15 +0200 |
| commit | c52f8eaca0d1ccc4c992cba039e35e099b5b478b (patch) | |
| tree | f9e78e2f929627e7547bef39fdf6cbcd544cb8d8 /kamon-core/src/main/scala/kamon/Kamon.scala | |
| parent | 1f5d9876dedb715ae1c31203ea4f15ebf031612c (diff) | |
| download | Kamon-c52f8eaca0d1ccc4c992cba039e35e099b5b478b.tar.gz Kamon-c52f8eaca0d1ccc4c992cba039e35e099b5b478b.tar.bz2 Kamon-c52f8eaca0d1ccc4c992cba039e35e099b5b478b.zip | |
make it compile for Scala 2.11 and 2.12
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 468308f2..3a85be0a 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -1,15 +1,15 @@ package kamon -import java.time.Duration -import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.atomic.AtomicReference import com.typesafe.config.{Config, ConfigFactory} -import kamon.metric.instrument._ -import kamon.metric.{MetricLookup, MetricRegistry} +import kamon.metric._ import kamon.trace.Tracer import kamon.util.{HexCodec, MeasurementUnit} +import scala.concurrent.duration.Duration +import scala.concurrent.forkjoin.ThreadLocalRandom + object Kamon extends MetricLookup { private val initialConfig = ConfigFactory.load() |