diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 02:01:00 +0100 |
| commit | 97536d1ccc4444d67334a7137d386c4c308836ad (patch) | |
| tree | 9858dae1c7e5c59d694672f3d1e9b3841000ad01 /kamon-core/src/main/scala/kamon/trace/Incubator.scala | |
| parent | cbe74e89112cfba113a1bba4184b417406e02b98 (diff) | |
| parent | 81c52c27d2b4784d561ae63b884b6e8c9e03db58 (diff) | |
| download | Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.gz Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.tar.bz2 Kamon-97536d1ccc4444d67334a7137d386c4c308836ad.zip | |
Merge branch 'master' into release-legacy-akka-2.2
Conflicts:
kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala
kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala
kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala
project/Dependencies.scala
project/Projects.scala
project/Settings.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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Incubator.scala b/kamon-core/src/main/scala/kamon/trace/Incubator.scala index 19ea4f39..5ee91a4b 100644 --- a/kamon-core/src/main/scala/kamon/trace/Incubator.scala +++ b/kamon-core/src/main/scala/kamon/trace/Incubator.scala @@ -16,14 +16,12 @@ package kamon.trace -import java.util.concurrent.TimeUnit - import akka.actor.{ ActorLogging, Props, Actor, ActorRef } import kamon.trace.Incubator.{ CheckForCompletedTraces, IncubatingTrace } import kamon.util.{ NanoInterval, RelativeNanoTimestamp } import scala.annotation.tailrec import scala.collection.immutable.Queue -import scala.concurrent.duration._ +import kamon.util.ConfigTools.Syntax class Incubator(subscriptions: ActorRef) extends Actor with ActorLogging { import kamon.util.ConfigTools.Syntax |