diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-05-18 22:15:27 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-05-18 22:15:27 -0300 |
| commit | 2f0bf70826cfde49e980d362179717314290b6f1 (patch) | |
| tree | 90a745be5562add855f5506bb9a96fed3e31a75e /kamon-play | |
| parent | b18d05149881e9eb141f9f4878916f37c5b52247 (diff) | |
| download | Kamon-2f0bf70826cfde49e980d362179717314290b6f1.tar.gz Kamon-2f0bf70826cfde49e980d362179717314290b6f1.tar.bz2 Kamon-2f0bf70826cfde49e980d362179717314290b6f1.zip | |
+ core: allow dispatcher configuration to core components
Diffstat (limited to 'kamon-play')
3 files changed, 3 insertions, 3 deletions
diff --git a/kamon-play/src/main/resources/reference.conf b/kamon-play/src/main/resources/reference.conf index 34e0f793..47a31ef4 100644 --- a/kamon-play/src/main/resources/reference.conf +++ b/kamon-play/src/main/resources/reference.conf @@ -6,5 +6,7 @@ kamon { play { include-trace-token-header = true trace-token-header-name = "X-Trace-Token" + + dispatcher = ${kamon.default-dispatcher} } }
\ No newline at end of file diff --git a/kamon-play/src/main/scala/kamon/play/Play.scala b/kamon-play/src/main/scala/kamon/play/Play.scala index d29c5666..ca9c10e5 100644 --- a/kamon-play/src/main/scala/kamon/play/Play.scala +++ b/kamon-play/src/main/scala/kamon/play/Play.scala @@ -18,7 +18,6 @@ package kamon.play import akka.actor.{ ExtendedActorSystem, Extension, ExtensionIdProvider, ExtensionId } import kamon.Kamon -import kamon.util.Contexts object Play extends ExtensionId[PlayExtension] with ExtensionIdProvider { override def lookup(): ExtensionId[_ <: Extension] = Play @@ -30,7 +29,7 @@ class PlayExtension(private val system: ExtendedActorSystem) extends Kamon.Exten private val config = system.settings.config.getConfig("kamon.play") - val defaultDispatcher = Contexts.lookupExecutionContext(Contexts.kamonDefaultDispatcher)(system) + val defaultDispatcher = system.dispatchers.lookup(config.getString("dispatcher")) val includeTraceToken: Boolean = config.getBoolean("include-trace-token-header") val traceTokenHeaderName: String = config.getString("trace-token-header-name") } diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala index 3a84f741..af11a07a 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala @@ -25,7 +25,6 @@ import akka.actor.ActorSystem import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation._ import scala.Some -import kamon.util.Contexts @Aspect class RequestInstrumentation { |