aboutsummaryrefslogtreecommitdiff
path: root/kamon-play/src
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-02-14 11:04:22 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-02-14 11:31:22 +0100
commit66b35556aa1bf0975cefa35603660991cdfcc526 (patch)
tree5bc71343929dcacca0d5576266c271b44e62f6ce /kamon-play/src
parent7da906da4fda6c6cd7eb6384bff0aef6b4ba094f (diff)
downloadKamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.gz
Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.bz2
Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.zip
! core: special treatment of settings.
Diffstat (limited to 'kamon-play/src')
-rw-r--r--kamon-play/src/main/resources/reference.conf1
-rw-r--r--kamon-play/src/main/scala/kamon/play/Play.scala2
2 files changed, 1 insertions, 2 deletions
diff --git a/kamon-play/src/main/resources/reference.conf b/kamon-play/src/main/resources/reference.conf
index 8dd7240e..88f1de26 100644
--- a/kamon-play/src/main/resources/reference.conf
+++ b/kamon-play/src/main/resources/reference.conf
@@ -21,7 +21,6 @@ kamon {
# to traces and client http segments.
name-generator = kamon.play.DefaultPlayNameGenerator
- dispatcher = kamon.default-dispatcher
}
modules {
diff --git a/kamon-play/src/main/scala/kamon/play/Play.scala b/kamon-play/src/main/scala/kamon/play/Play.scala
index 3c3e4fa7..9e160d58 100644
--- a/kamon-play/src/main/scala/kamon/play/Play.scala
+++ b/kamon-play/src/main/scala/kamon/play/Play.scala
@@ -44,7 +44,7 @@ class PlayExtension(private val system: ExtendedActorSystem) extends Kamon.Exten
metricsExtension.register(entity, new HttpServerMetrics(factory)).recorder
}
- val defaultDispatcher = system.dispatchers.lookup(config.getString("dispatcher"))
+ val defaultDispatcher = system.dispatcher
val includeTraceToken: Boolean = config.getBoolean("automatic-trace-token-propagation")
val traceTokenHeaderName: String = config.getString("trace-token-header-name")