diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 10:46:36 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 10:46:36 +0100 |
commit | 8cd862debfbfa6d92473d601880cbd7c088601a1 (patch) | |
tree | dad23f5813d8e48b0b798def732b11a2eadc451a /kamon-core/src/main/scala/kamon/Kamon.scala | |
parent | 1c176f002cc26061b1ccb04ec9f13ab4fb39eacd (diff) | |
download | Kamon-8cd862debfbfa6d92473d601880cbd7c088601a1.tar.gz Kamon-8cd862debfbfa6d92473d601880cbd7c088601a1.tar.bz2 Kamon-8cd862debfbfa6d92473d601880cbd7c088601a1.zip |
! core: drop the Extension postfix on all core components.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index cf492125..a2a24f49 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -18,15 +18,15 @@ import _root_.akka.actor import _root_.akka.actor._ import com.typesafe.config.{ ConfigFactory, Config } import kamon.metric._ -import kamon.trace.{ TracerExtensionImpl, TracerExtension } +import kamon.trace.{ TracerImpl, Tracer } object Kamon { trait Extension extends actor.Extension private case class KamonCoreComponents( - metrics: MetricsExtension, - tracer: TracerExtension, - simpleMetrics: SimpleMetricsExtension) + metrics: Metrics, + tracer: Tracer, + simpleMetrics: SimpleMetrics) @volatile private var _system: ActorSystem = _ @volatile private var _coreComponents: Option[KamonCoreComponents] = None @@ -42,9 +42,9 @@ object Kamon { } if (_coreComponents.isEmpty) { - val metrics = MetricsExtensionImpl(config) - val simpleMetrics = SimpleMetricsExtensionImpl(metrics) - val tracer = TracerExtensionImpl(metrics, config) + val metrics = MetricsImpl(config) + val simpleMetrics = SimpleMetricsImpl(metrics) + val tracer = TracerImpl(metrics, config) _coreComponents = Some(KamonCoreComponents(metrics, tracer, simpleMetrics)) _system = ActorSystem("kamon", resolveInternalConfig) @@ -64,13 +64,13 @@ object Kamon { _system = null } - def metrics: MetricsExtension = + def metrics: Metrics = ifStarted(_.metrics) - def tracer: TracerExtension = + def tracer: Tracer = ifStarted(_.tracer) - def simpleMetrics: SimpleMetricsExtension = + def simpleMetrics: SimpleMetrics = ifStarted(_.simpleMetrics) def apply[T <: Kamon.Extension](key: ExtensionId[T]): T = |