1 files changed, 5 insertions, 3 deletions
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
+}