diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-29 03:42:27 +0100 |
| commit | 75bd9503aebee628da394a935816991e7a790092 (patch) | |
| tree | f4df3333826cec805fadc14894579f1bc1054279 /kamon-core/src/main/scala/kamon/trace/Incubator.scala | |
| parent | 61089a75240f5cc21b056087f1d633dd31981c61 (diff) | |
| parent | 9839db9d46312435822b6b5faffbbc445af80077 (diff) | |
| download | Kamon-75bd9503aebee628da394a935816991e7a790092.tar.gz Kamon-75bd9503aebee628da394a935816991e7a790092.tar.bz2 Kamon-75bd9503aebee628da394a935816991e7a790092.zip | |
Merge branch 'wip/improve-metric-recorders-infrastructure'
Conflicts:
kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/Incubator.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/trace/Incubator.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Incubator.scala b/kamon-core/src/main/scala/kamon/trace/Incubator.scala index c39a9984..3b2a3bf9 100644 --- a/kamon-core/src/main/scala/kamon/trace/Incubator.scala +++ b/kamon-core/src/main/scala/kamon/trace/Incubator.scala @@ -19,8 +19,8 @@ package kamon.trace import java.util.concurrent.TimeUnit import akka.actor.{ ActorLogging, Props, Actor, ActorRef } -import kamon.{ NanoInterval, RelativeNanoTimestamp } import kamon.trace.Incubator.{ CheckForCompletedTraces, IncubatingTrace } +import kamon.util.{ NanoInterval, RelativeNanoTimestamp } import scala.annotation.tailrec import scala.collection.immutable.Queue import scala.concurrent.duration._ |