! core: special treatment of settings.

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 }