diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-09 10:29:37 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-09 13:57:21 +0200 |
commit | 9d07669dae3ea1bc74b1d21e65618581292a6079 (patch) | |
tree | af57393b18a46abd652c8781274cab8d6ed01e6e /kamon-core/src/main/scala/kamon/Kamon.scala | |
parent | 1b73eb5a8b7f112b2019380392feccdef824aaf3 (diff) | |
download | Kamon-9d07669dae3ea1bc74b1d21e65618581292a6079.tar.gz Kamon-9d07669dae3ea1bc74b1d21e65618581292a6079.tar.bz2 Kamon-9d07669dae3ea1bc74b1d21e65618581292a6079.zip |
replace auto settings for environment with actual values
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index a0c35a71..29c85559 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -22,21 +22,19 @@ import io.opentracing.propagation.Format import io.opentracing.{ActiveSpan, Span, SpanContext} import kamon.metric._ import kamon.trace.Tracer -import kamon.util.{HexCodec, MeasurementUnit} +import kamon.util.MeasurementUnit import scala.concurrent.Future import scala.concurrent.duration.Duration -import scala.concurrent.forkjoin.ThreadLocalRandom object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Tracer { private val initialConfig = ConfigFactory.load() - private val incarnation = HexCodec.toLowerHex(ThreadLocalRandom.current().nextLong()) private val metricRegistry = new MetricRegistry(initialConfig) private val reporterRegistry = new ReporterRegistryImpl(metricRegistry, initialConfig) private val tracer = new Tracer(Kamon, reporterRegistry) - private val env = new AtomicReference[Environment](environmentFromConfig(ConfigFactory.load())) + private val env = new AtomicReference[Environment](Environment.fromConfig(ConfigFactory.load())) def environment: Environment = env.get() @@ -44,7 +42,7 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac def reconfigure(config: Config): Unit = synchronized { metricRegistry.reconfigure(config) reporterRegistry.reconfigure(config) - env.set(environmentFromConfig(config)) + env.set(Environment.fromConfig(config)) } @@ -100,17 +98,4 @@ object Kamon extends MetricLookup with ReporterRegistry with io.opentracing.Trac override def stopAllReporters(): Future[Unit] = reporterRegistry.stopAllReporters() - - - case class Environment(config: Config, application: String, host: String, instance: String, incarnation: String) - - private def environmentFromConfig(config: Config): Environment = { - val environmentConfig = config.getConfig("kamon.environment") - - val application = environmentConfig.getString("application") - val host = environmentConfig.getString("host") - val instance = environmentConfig.getString("instance") - - Environment(config, application, host, instance, incarnation) - } } |