diff options
author | Diego <diegolparra@gmail.com> | 2014-04-23 13:38:11 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2014-04-23 13:38:11 -0300 |
commit | 620ab1bab83254d0f49bd7c097dc2d0aa01d70da (patch) | |
tree | c8bae900e8070a3d0b8e0a546238faeb91b02695 /kamon-core | |
parent | ced494db410a39a96e92d3dd376f8e9be4d309d6 (diff) | |
download | Kamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.tar.gz Kamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.tar.bz2 Kamon-620ab1bab83254d0f49bd7c097dc2d0aa01d70da.zip |
+ all: fix compilation issues
Diffstat (limited to 'kamon-core')
-rw-r--r-- | kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala | 2 | ||||
-rw-r--r-- | kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala b/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala index e398ebe0..c9990229 100644 --- a/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala +++ b/kamon-core/src/main/scala/kamon/metrics/Subscriptions.scala @@ -28,7 +28,7 @@ class Subscriptions extends Actor { import context.system val config = context.system.settings.config - val tickInterval = Duration(config.getNanoseconds("kamon.metrics.tick-interval"), TimeUnit.NANOSECONDS) + val tickInterval = Duration(config.getDuration("kamon.metrics.tick-interval", TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS) val flushMetricsSchedule = context.system.scheduler.schedule(tickInterval, tickInterval, self, FlushMetrics)(context.dispatcher) var lastTick: Long = System.currentTimeMillis() diff --git a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala index acc939fb..4e62c9f7 100644 --- a/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/instrumentation/ActorMessagePassingTracingSpec.scala @@ -23,7 +23,7 @@ import kamon.trace.TraceRecorder import akka.pattern.{ pipe, ask } import akka.util.Timeout import scala.concurrent.duration._ -import akka.routing.RoundRobinRouter +import akka.routing.{ RoundRobinPool } class ActorMessagePassingTracingSpec extends TestKit(ActorSystem("actor-message-passing-tracing-spec")) with WordSpecLike with ImplicitSender { implicit val executionContext = system.dispatcher @@ -73,7 +73,7 @@ class ActorMessagePassingTracingSpec extends TestKit(ActorSystem("actor-message- } trait RoutedEchoActorFixture extends EchoActorFixture { - override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinRouter(nrOfInstances = 1))) + override val ctxEchoActor = system.actorOf(Props[TraceContextEcho].withRouter(RoundRobinPool(nrOfInstances = 1))) } } |