diff options
author | Diego Parra <diegolparra@gmail.com> | 2016-01-23 11:56:01 -0300 |
---|---|---|
committer | Diego Parra <diegolparra@gmail.com> | 2016-01-23 11:56:01 -0300 |
commit | 024973f193c8575db2af68b8984a06f744a70f5e (patch) | |
tree | c2708bbb3de1462af073c6e20e2470db62bd39c3 | |
parent | c1285842d5ed96bf0ed6b0eb563e645c597af6ea (diff) | |
parent | 0e847fc55ad846e55ec8e5e80755df2aa7c95caf (diff) | |
download | Kamon-024973f193c8575db2af68b8984a06f744a70f5e.tar.gz Kamon-024973f193c8575db2af68b8984a06f744a70f5e.tar.bz2 Kamon-024973f193c8575db2af68b8984a06f744a70f5e.zip |
Merge pull request #305 from jcazevedo/system-metrics-filter
= system-metrics: apply metric filters
3 files changed, 15 insertions, 8 deletions
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 2e9ea954..5258a81e 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 @@ -45,9 +45,11 @@ object GarbageCollectionMetrics { name.replaceAll("""[^\w]""", "-").toLowerCase def register(metricsExtension: MetricsModule): Unit = { - ManagementFactory.getGarbageCollectorMXBeans.asScala.filter(_.isValid) map { gc ⇒ + ManagementFactory.getGarbageCollectorMXBeans.asScala.filter(_.isValid) foreach { gc ⇒ val gcName = sanitizeCollectorName(gc.getName) - Kamon.metrics.entity(EntityRecorderFactory("system-metric", new GarbageCollectionMetrics(gc, _)), s"$gcName-garbage-collector") + val metricName = s"$gcName-garbage-collector" + if (metricsExtension.shouldTrack(metricName, "system-metric")) + Kamon.metrics.entity(EntityRecorderFactory("system-metric", new GarbageCollectionMetrics(gc, _)), metricName) } } } 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 2a86c13c..b5421375 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 @@ -20,8 +20,10 @@ import kamon.metric.instrument.InstrumentFactory import kamon.metric.{ MetricsModule, EntityRecorderFactory, EntityRecorder } abstract class JmxSystemMetricRecorderCompanion(metricName: String) { - def register(metricsExtension: MetricsModule): EntityRecorder = - metricsExtension.entity(EntityRecorderFactory("system-metric", apply(_)), metricName) + def register(metricsExtension: MetricsModule): Unit = { + if (metricsExtension.shouldTrack(metricName, "system-metric")) + metricsExtension.entity(EntityRecorderFactory("system-metric", apply(_)), metricName) + } def apply(instrumentFactory: InstrumentFactory): EntityRecorder -}
\ No newline at end of file +} 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 c0da6dc1..585352e4 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 @@ -38,7 +38,7 @@ class SigarMetricsUpdater(refreshInterval: FiniteDuration) extends Actor { MemoryMetrics.register(sigar, metricsExtension, logger), NetworkMetrics.register(sigar, metricsExtension, logger), ProcessCpuMetrics.register(sigar, metricsExtension, logger), - ULimitMetrics.register(sigar, metricsExtension, logger)) + ULimitMetrics.register(sigar, metricsExtension, logger)).flatten val refreshSchedule = context.system.scheduler.schedule(refreshInterval, refreshInterval, self, UpdateSigarMetrics)(context.dispatcher) @@ -83,8 +83,11 @@ object SigarSafeRunner { } abstract class SigarMetricRecorderCompanion(metricName: String) { - def register(sigar: Sigar, metricsExtension: MetricsModule, logger: LoggingAdapter = NoLogging): SigarMetric = - metricsExtension.entity(EntityRecorderFactory("system-metric", apply(sigar, _)), metricName) + def register(sigar: Sigar, metricsExtension: MetricsModule, logger: LoggingAdapter = NoLogging): Option[SigarMetric] = + if (metricsExtension.shouldTrack(metricName, "system-metric")) + Some(metricsExtension.entity(EntityRecorderFactory("system-metric", apply(sigar, _)), metricName)) + else + None def apply(sigar: Sigar, instrumentFactory: InstrumentFactory, logger: LoggingAdapter = NoLogging): SigarMetric } |