diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2016-12-24 03:14:29 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2016-12-24 03:17:06 +0100 |
| commit | becf6cac7142011cc478ab7ab15d51799b190951 (patch) | |
| tree | ebfe0193f2cecf46cda386188c474135f01c20df /kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | |
| parent | 68de5a1bd092fc7dddf2045491dd36a353b72a71 (diff) | |
| download | Kamon-becf6cac7142011cc478ab7ab15d51799b190951.tar.gz Kamon-becf6cac7142011cc478ab7ab15d51799b190951.tar.bz2 Kamon-becf6cac7142011cc478ab7ab15d51799b190951.zip | |
allow restarting Kamon in the same process.
taking some ideas from #395, this commit removes ConfigProviders and
allows Kamon to be used in "permissive" mode until it gets started.
Diffstat (limited to 'kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala')
| -rw-r--r-- | kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala index a869149b..49bcee68 100644 --- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala +++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala @@ -32,9 +32,9 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W ActorSystem(actorSystemName, mergedConfig) } - def config: Config = Kamon.defaultConfig + def config: Config = Kamon.config - def mergedConfig: Config = config.withFallback(Kamon.defaultConfig) + def mergedConfig: Config = config.withFallback(Kamon.config) def newContext(name: String): TraceContext = Kamon.tracer.newContext(name) |