aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-05-09 18:23:21 -0300
committerDiego <diegolparra@gmail.com>2014-05-09 18:23:21 -0300
commit0ce3f4c0e8eb7dfd4aadd8300880e001a9a9bb8d (patch)
treef4f08e425ddb7261ddd34d69e78315292e7cbdda /kamon-core/src/main/scala/kamon
parente7d18421c354d4dbc3c5b77073fb0b195eb45cfe (diff)
downloadKamon-0ce3f4c0e8eb7dfd4aadd8300880e001a9a9bb8d.tar.gz
Kamon-0ce3f4c0e8eb7dfd4aadd8300880e001a9a9bb8d.tar.bz2
Kamon-0ce3f4c0e8eb7dfd4aadd8300880e001a9a9bb8d.zip
+ play: removed default dispatchers to kamon default dispatcher and refactor test in WSInstrumentationSpec
Diffstat (limited to 'kamon-core/src/main/scala/kamon')
-rw-r--r--kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala
index 359540fc..9a08da71 100644
--- a/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala
+++ b/kamon-core/src/main/scala/kamon/metrics/MetricsExtension.scala
@@ -19,7 +19,7 @@ package kamon.metrics
import scala.collection.concurrent.TrieMap
import akka.actor._
import com.typesafe.config.Config
-import kamon.util.GlobPathFilter
+import kamon.util.{ Contexts, GlobPathFilter }
import kamon.Kamon
import akka.actor
import kamon.metrics.Metrics.MetricGroupFilter
@@ -76,6 +76,7 @@ class MetricsExtension(system: ExtendedActorSystem) extends Kamon.Extension {
allFilters.toMap
}
+ val defaultDispatcher = Contexts.lookupExecutionContext(Contexts.kamonDefaultDispatcher)(system)
}
object Metrics extends ExtensionId[MetricsExtension] with ExtensionIdProvider {