diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-14 11:04:22 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-14 11:31:22 +0100 |
commit | 66b35556aa1bf0975cefa35603660991cdfcc526 (patch) | |
tree | 5bc71343929dcacca0d5576266c271b44e62f6ce /kamon-akka | |
parent | 7da906da4fda6c6cd7eb6384bff0aef6b4ba094f (diff) | |
download | Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.gz Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.bz2 Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.zip |
! core: special treatment of settings.
Diffstat (limited to 'kamon-akka')
-rw-r--r-- | kamon-akka/src/main/resources/reference.conf | 2 | ||||
-rw-r--r-- | kamon-akka/src/main/scala/kamon/akka/AkkaExtension.scala | 2 | ||||
-rw-r--r-- | kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/kamon-akka/src/main/resources/reference.conf b/kamon-akka/src/main/resources/reference.conf index 5f35e267..cc2b6060 100644 --- a/kamon-akka/src/main/resources/reference.conf +++ b/kamon-akka/src/main/resources/reference.conf @@ -12,8 +12,6 @@ kamon { # - heavyweight: logs the warning when a timeout is reached using a stack trace captured at the moment the future was created. ask-pattern-timeout-warning = off - # Default dispatcher for all akka module operations - dispatcher = kamon.default-dispatcher } metric.filters { diff --git a/kamon-akka/src/main/scala/kamon/akka/AkkaExtension.scala b/kamon-akka/src/main/scala/kamon/akka/AkkaExtension.scala index cbca7db6..5b3d19d4 100644 --- a/kamon-akka/src/main/scala/kamon/akka/AkkaExtension.scala +++ b/kamon-akka/src/main/scala/kamon/akka/AkkaExtension.scala @@ -23,7 +23,7 @@ import kamon._ class AkkaExtension(system: ExtendedActorSystem) extends Kamon.Extension { val config = system.settings.config.getConfig("kamon.akka") val askPatternTimeoutWarning = config.getString("ask-pattern-timeout-warning") - val dispatcher = system.dispatchers.lookup(config.getString("dispatcher")) + val dispatcher = system.dispatcher } object Akka extends ExtensionId[AkkaExtension] with ExtensionIdProvider { diff --git a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala index 209b5cf5..2379bff5 100644 --- a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala @@ -15,17 +15,14 @@ package kamon.akka -import java.nio.LongBuffer -import akka.actor.{ ActorRef, ActorSystem } +import akka.actor.ActorRef import akka.dispatch.MessageDispatcher -import akka.testkit.{ TestKitBase, TestProbe } +import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory import kamon.Kamon -import kamon.metric.instrument.CollectionContext import kamon.metric.{ EntityRecorder, EntitySnapshot } import kamon.testkit.BaseKamonSpec -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } |