! core: drop the Extension postfix on all core components.

4 files changed, 17 insertions, 18 deletions

diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/Metrics.scala
index 87911352..d79b1de3 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Metrics.scala
@@ -26,8 +26,8 @@ import kamon.util.{ LazyActorRef, TriemapAtomicGetOrElseUpdate }
 
 case class EntityRegistration[T <: EntityRecorder](entity: Entity, recorder: T)
 
-trait MetricsExtension {
-  def settings: MetricsExtensionSettings
+trait Metrics {
+  def settings: MetricsSettings
   def shouldTrack(entity: Entity): Boolean
   def shouldTrack(entityName: String, category: String): Boolean =
     shouldTrack(Entity(entityName, category))
@@ -55,11 +55,11 @@ trait MetricsExtension {
   def instrumentFactory(category: String): InstrumentFactory
 }
 
-private[kamon] class MetricsExtensionImpl(config: Config) extends MetricsExtension {
+private[kamon] class MetricsImpl(config: Config) extends Metrics {
   private val _trackedEntities = TrieMap.empty[Entity, EntityRecorder]
   private val _subscriptions = new LazyActorRef
 
-  val settings = MetricsExtensionSettings(config)
+  val settings = MetricsSettings(config)
 
   def shouldTrack(entity: Entity): Boolean =
     settings.entityFilters.get(entity.category).map {
@@ -133,9 +133,9 @@ private[kamon] class MetricsExtensionImpl(config: Config) extends MetricsExtensi
   }
 }
 
-private[kamon] object MetricsExtensionImpl {
+private[kamon] object MetricsImpl {
 
   def apply(config: Config) =
-    new MetricsExtensionImpl(config)
+    new MetricsImpl(config)
 }
 
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtensionSettings.scala b/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala
index 9881ed00..a472a89b 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricsExtensionSettings.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala
@@ -25,7 +25,7 @@ import scala.concurrent.duration.FiniteDuration
 /**
  *  Configuration settings for the Metrics extension, as read from the `kamon.metric` configuration key.
  */
-case class MetricsExtensionSettings(
+case class MetricsSettings(
     tickInterval: FiniteDuration,
     defaultCollectionContextBufferSize: Int,
     trackUnmatchedEntities: Boolean,
@@ -48,11 +48,10 @@ case class EntityFilter(includes: List[GlobPathFilter], excludes: List[GlobPathF
     includes.exists(_.accept(name)) && !excludes.exists(_.accept(name))
 }
 
-object MetricsExtensionSettings {
+object MetricsSettings {
   import kamon.util.ConfigTools.Syntax
-  import scala.concurrent.duration._
 
-  def apply(config: Config): MetricsExtensionSettings = {
+  def apply(config: Config): MetricsSettings = {
     val metricConfig = config.getConfig("kamon.metric")
 
     val tickInterval = metricConfig.getFiniteDuration("tick-interval")
@@ -65,7 +64,7 @@ object MetricsExtensionSettings {
     val instrumentFactories = loadInstrumentFactories(metricConfig.getConfig("instrument-settings"), defaultInstrumentSettings, refreshScheduler)
     val defaultInstrumentFactory = new InstrumentFactory(Map.empty, defaultInstrumentSettings, refreshScheduler)
 
-    MetricsExtensionSettings(tickInterval, collectBufferSize, trackUnmatchedEntities, entityFilters, instrumentFactories,
+    MetricsSettings(tickInterval, collectBufferSize, trackUnmatchedEntities, entityFilters, instrumentFactories,
       defaultInstrumentFactory, refreshScheduler)
   }
 
diff --git a/kamon-core/src/main/scala/kamon/metric/SimpleMetrics.scala b/kamon-core/src/main/scala/kamon/metric/SimpleMetrics.scala
index b8dc54df..6324c320 100644
--- a/kamon-core/src/main/scala/kamon/metric/SimpleMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metric/SimpleMetrics.scala
@@ -22,7 +22,7 @@ import kamon.metric.instrument._
 
 import scala.concurrent.duration.FiniteDuration
 
-trait SimpleMetricsExtension {
+trait SimpleMetrics {
   def histogram(name: String): Histogram
   def histogram(name: String, dynamicRange: DynamicRange): Histogram
   def histogram(name: String, unitOfMeasurement: UnitOfMeasurement): Histogram
@@ -69,7 +69,7 @@ trait SimpleMetricsExtension {
 
 }
 
-private[kamon] class SimpleMetricsExtensionImpl(instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) with SimpleMetricsExtension {
+private[kamon] class SimpleMetricsImpl(instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) with SimpleMetrics {
   override def histogram(name: String): Histogram =
     super.histogram(name)
 
@@ -191,12 +191,12 @@ private[kamon] class SimpleMetricsExtensionImpl(instrumentFactory: InstrumentFac
     super.removeCounter(key)
 }
 
-private[kamon] object SimpleMetricsExtensionImpl {
+private[kamon] object SimpleMetricsImpl {
   val SimpleMetricsEntity = Entity("simple-metric", "simple-metric")
 
-  def apply(metricsExtension: MetricsExtension): SimpleMetricsExtensionImpl = {
+  def apply(metricsExtension: Metrics): SimpleMetricsImpl = {
     val instrumentFactory = metricsExtension.instrumentFactory(SimpleMetricsEntity.category)
-    val simpleMetricsExtension = new SimpleMetricsExtensionImpl(instrumentFactory)
+    val simpleMetricsExtension = new SimpleMetricsImpl(instrumentFactory)
 
     metricsExtension.register(SimpleMetricsEntity, simpleMetricsExtension).recorder
   }
diff --git a/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala b/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala
index 68b545a5..3b6be70b 100644
--- a/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala
+++ b/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala
@@ -24,7 +24,7 @@ import scala.concurrent.duration.FiniteDuration
 /**
  *  Manages subscriptions to metrics and dispatch snapshots on every tick to all subscribers.
  */
-private[kamon] class SubscriptionsDispatcher(interval: FiniteDuration, metricsExtension: MetricsExtensionImpl) extends Actor {
+private[kamon] class SubscriptionsDispatcher(interval: FiniteDuration, metricsExtension: MetricsImpl) extends Actor {
   var lastTick = MilliTimestamp.now
   var oneShotSubscriptions = Map.empty[ActorRef, SubscriptionFilter]
   var permanentSubscriptions = Map.empty[ActorRef, SubscriptionFilter]
@@ -81,7 +81,7 @@ private[kamon] class SubscriptionsDispatcher(interval: FiniteDuration, metricsEx
 }
 
 object SubscriptionsDispatcher {
-  def props(interval: FiniteDuration, metricsExtension: MetricsExtensionImpl): Props =
+  def props(interval: FiniteDuration, metricsExtension: MetricsImpl): Props =
     Props(new SubscriptionsDispatcher(interval, metricsExtension))
 
   case object Tick