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 | 073713256939dac73d318faa9cabc3c8c93c5713 (patch) | |
tree | 0ce0afd53229dce4c059deebf5bb67411d554e1b /kamon-core/src/main/scala/kamon/Kamon.scala | |
parent | 07fc83bb01c5873b47aff50d6d3abbb9f11842bd (diff) | |
download | Kamon-073713256939dac73d318faa9cabc3c8c93c5713.tar.gz Kamon-073713256939dac73d318faa9cabc3c8c93c5713.tar.bz2 Kamon-073713256939dac73d318faa9cabc3c8c93c5713.zip |
! core: special treatment of settings.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 2bed4737..ab9ce05e 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -32,13 +32,22 @@ object Kamon { @volatile private var _coreComponents: Option[KamonCoreComponents] = None def start(config: Config): Unit = synchronized { + def resolveInternalConfig: Config = { + val internalConfig = config.getConfig("kamon.internal-config") + + config + .withoutPath("akka") + .withoutPath("spray") + .withFallback(internalConfig) + } + if (_coreComponents.isEmpty) { val metrics = MetricsExtensionImpl(config) val simpleMetrics = UserMetricsExtensionImpl(metrics) val tracer = TracerExtensionImpl(metrics, config) _coreComponents = Some(KamonCoreComponents(metrics, tracer, simpleMetrics)) - _system = ActorSystem("kamon", config) + _system = ActorSystem("kamon", resolveInternalConfig) metrics.start(_system) tracer.start(_system) |