From 8a532fc8c95a5700721248b6b4f558d9a1dcebcb Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 15 Feb 2015 10:46:36 +0100 Subject: ! core: drop the Extension postfix on all core components. --- .../src/main/scala/kamon/system/jmx/GarbageCollectionMetrics.scala | 4 ++-- .../scala/kamon/system/jmx/JmxSystemMetricRecorderCompanion.scala | 4 ++-- .../src/main/scala/kamon/system/sigar/SigarMetricsUpdater.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kamon-system-metrics') diff --git a/kamon-system-metrics/src/main/scala/kamon/system/jmx/GarbageCollectionMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/jmx/GarbageCollectionMetrics.scala index a9ab4b62..59d4050c 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/jmx/GarbageCollectionMetrics.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/jmx/GarbageCollectionMetrics.scala @@ -18,7 +18,7 @@ package kamon.system.jmx import java.lang.management.{ GarbageCollectorMXBean, ManagementFactory } -import kamon.metric.{ Entity, MetricsExtension, GenericEntityRecorder } +import kamon.metric.{ Entity, Metrics, GenericEntityRecorder } import kamon.metric.instrument.{ DifferentialValueCollector, Time, InstrumentFactory } import scala.collection.JavaConverters._ @@ -43,7 +43,7 @@ object GarbageCollectionMetrics { def sanitizeCollectorName(name: String): String = name.replaceAll("""[^\w]""", "-").toLowerCase - def register(metricsExtension: MetricsExtension): Unit = { + def register(metricsExtension: Metrics): Unit = { val instrumentFactory = metricsExtension.instrumentFactory("system-metric") ManagementFactory.getGarbageCollectorMXBeans.asScala.filter(_.isValid) map { gc ⇒ diff --git a/kamon-system-metrics/src/main/scala/kamon/system/jmx/JmxSystemMetricRecorderCompanion.scala b/kamon-system-metrics/src/main/scala/kamon/system/jmx/JmxSystemMetricRecorderCompanion.scala index be0ee08c..8837aec0 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/jmx/JmxSystemMetricRecorderCompanion.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/jmx/JmxSystemMetricRecorderCompanion.scala @@ -17,10 +17,10 @@ package kamon.system.jmx import kamon.metric.instrument.InstrumentFactory -import kamon.metric.{ Entity, EntityRecorder, MetricsExtension } +import kamon.metric.{ Entity, EntityRecorder, Metrics } abstract class JmxSystemMetricRecorderCompanion(metricName: String) { - def register(metricsExtension: MetricsExtension): EntityRecorder = { + def register(metricsExtension: Metrics): EntityRecorder = { val instrumentFactory = metricsExtension.instrumentFactory("system-metric") metricsExtension.register(Entity(metricName, "system-metric"), apply(instrumentFactory)).recorder } diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarMetricsUpdater.scala b/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarMetricsUpdater.scala index e68b0ede..68b133b0 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarMetricsUpdater.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarMetricsUpdater.scala @@ -19,7 +19,7 @@ package kamon.system.sigar import akka.actor.{ Props, Actor } import kamon.Kamon import kamon.metric.instrument.InstrumentFactory -import kamon.metric.{ Entity, EntityRecorder, MetricsExtension } +import kamon.metric.{ Entity, EntityRecorder, Metrics } import kamon.system.sigar.SigarMetricsUpdater.UpdateSigarMetrics import org.hyperic.sigar.Sigar @@ -65,7 +65,7 @@ trait SigarMetric extends EntityRecorder { } abstract class SigarMetricRecorderCompanion(metricName: String) { - def register(sigar: Sigar, metricsExtension: MetricsExtension): SigarMetric = { + def register(sigar: Sigar, metricsExtension: Metrics): SigarMetric = { val instrumentFactory = metricsExtension.instrumentFactory("system-metric") metricsExtension.register(Entity(metricName, "system-metric"), apply(sigar, instrumentFactory)).recorder } -- cgit v1.2.3