diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-08-25 11:58:02 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-08-25 11:58:02 +0200 |
commit | 3f0eaed8f0ac62057a9f515c62540f237cfd6c6e (patch) | |
tree | d151772295ca642d6f7f6975a059bf42c1986898 | |
parent | 6923387158b70fc3815c9dcc8a46f275db430b87 (diff) | |
parent | 2668550433cc0629affc7e74daa4693634965a4e (diff) | |
download | Kamon-3f0eaed8f0ac62057a9f515c62540f237cfd6c6e.tar.gz Kamon-3f0eaed8f0ac62057a9f515c62540f237cfd6c6e.tar.bz2 Kamon-3f0eaed8f0ac62057a9f515c62540f237cfd6c6e.zip |
Merge pull request #245 from tferi/generic-mem-metrics
= Generic mem metrics
12 files changed, 138 insertions, 169 deletions
diff --git a/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala b/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala index 23ecde79..91cbdee9 100644 --- a/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala +++ b/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala @@ -1,6 +1,6 @@ /* * ========================================================================================= - * Copyright © 2013-2014 the kamon project <http://kamon.io/> + * Copyright © 2013-2015 the kamon project <http://kamon.io/> * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at @@ -20,40 +20,20 @@ import java.util.concurrent.ThreadPoolExecutor import _root_.akka.dispatch.ForkJoinExecutorConfigurator.AkkaForkJoinPool import kamon.metric._ -import kamon.metric.instrument.{ DifferentialValueCollector, InstrumentFactory } - -class ForkJoinPoolDispatcherMetrics(fjp: AkkaForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { - val paralellism = minMaxCounter("parallelism") - paralellism.increment(fjp.getParallelism) // Steady value. - - val poolSize = gauge("pool-size", fjp.getPoolSize.toLong) - val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong) - val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong) - val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount) -} +import kamon.metric.instrument.InstrumentFactory +import kamon.util.executors.{ ForkJoinPoolMetrics, ThreadPoolExecutorMetrics } object ForkJoinPoolDispatcherMetrics { - - def factory(fjp: AkkaForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolDispatcherMetrics] { + def factory(fjp: AkkaForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolMetrics] { def category: String = AkkaDispatcherMetrics.Category - def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolDispatcherMetrics(fjp, instrumentFactory) + def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolMetrics(fjp, instrumentFactory) } } -class ThreadPoolExecutorDispatcherMetrics(tpe: ThreadPoolExecutor, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { - val corePoolSize = gauge("core-pool-size", tpe.getCorePoolSize.toLong) - val maxPoolSize = gauge("max-pool-size", tpe.getMaximumPoolSize.toLong) - val poolSize = gauge("pool-size", tpe.getPoolSize.toLong) - val activeThreads = gauge("active-threads", tpe.getActiveCount.toLong) - val processedTasks = gauge("processed-tasks", DifferentialValueCollector(() ⇒ { - tpe.getTaskCount - })) -} - object ThreadPoolExecutorDispatcherMetrics { - def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorDispatcherMetrics] { + def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorMetrics] { def category: String = AkkaDispatcherMetrics.Category - def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorDispatcherMetrics(tpe, instrumentFactory) + def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorMetrics(tpe, instrumentFactory) } } diff --git a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala index cdd1dd12..678c7f73 100644 --- a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala @@ -1,5 +1,5 @@ /* ========================================================================================= - * Copyright © 2013-2014 the kamon project <http://kamon.io/> + * Copyright © 2013-2015 the kamon project <http://kamon.io/> * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at @@ -24,6 +24,7 @@ import kamon.Kamon import kamon.akka.RouterMetricsTestActor.{ Pong, Ping } import kamon.metric.{ EntityRecorder, EntitySnapshot } import kamon.testkit.BaseKamonSpec +import kamon.util.executors.{ ForkJoinPoolMetrics, ThreadPoolExecutorMetrics } import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } @@ -178,14 +179,14 @@ class DispatcherMetricsSpec extends BaseKamonSpec("dispatcher-metrics-spec") { def refreshDispatcherInstruments(dispatcher: MessageDispatcher, dispatcherType: String): Unit = { findDispatcherRecorder(dispatcher, dispatcherType) match { - case Some(tpe: ThreadPoolExecutorDispatcherMetrics) ⇒ + case Some(tpe: ThreadPoolExecutorMetrics) ⇒ tpe.processedTasks.refreshValue() tpe.activeThreads.refreshValue() tpe.maxPoolSize.refreshValue() tpe.poolSize.refreshValue() tpe.corePoolSize.refreshValue() - case Some(fjp: ForkJoinPoolDispatcherMetrics) ⇒ + case Some(fjp: ForkJoinPoolMetrics) ⇒ fjp.activeThreads.refreshValue() fjp.poolSize.refreshValue() fjp.queuedTaskCount.refreshValue() diff --git a/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala new file mode 100644 index 00000000..e1d84df3 --- /dev/null +++ b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala @@ -0,0 +1,91 @@ +/* + * ========================================================================================= + * Copyright © 2013-2015 the kamon project <http://kamon.io/> + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ + +package kamon.util.executors + +import kamon.Kamon +import kamon.metric.{ EntityRecorderFactory, Entity, GenericEntityRecorder } +import kamon.metric.instrument.{ DifferentialValueCollector, InstrumentFactory } +import java.util.concurrent.ThreadPoolExecutor +import scala.concurrent.forkjoin.ForkJoinPool +import java.util.concurrent.{ ForkJoinPool ⇒ JavaForkJoinPool } + +class ForkJoinPoolMetrics(fjp: ForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { + val paralellism = minMaxCounter("parallelism") + paralellism.increment(fjp.getParallelism) // Steady value. + + val poolSize = gauge("pool-size", fjp.getPoolSize.toLong) + val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong) + val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong) + val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount) +} + +object ForkJoinPoolMetrics { + def factory(fjp: ForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolMetrics] { + def category: String = ExecutorServiceMetrics.Category + def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolMetrics(fjp, instrumentFactory) + } +} + +class JavaForkJoinPoolMetrics(fjp: JavaForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { + val paralellism = minMaxCounter("parallelism") + paralellism.increment(fjp.getParallelism) // Steady value. + + val poolSize = gauge("pool-size", fjp.getPoolSize.toLong) + val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong) + val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong) + val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount) +} + +object JavaForkJoinPoolMetrics { + def factory(fjp: JavaForkJoinPool) = new EntityRecorderFactory[JavaForkJoinPoolMetrics] { + def category: String = ExecutorServiceMetrics.Category + def createRecorder(instrumentFactory: InstrumentFactory) = new JavaForkJoinPoolMetrics(fjp, instrumentFactory) + } +} + +class ThreadPoolExecutorMetrics(tpe: ThreadPoolExecutor, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { + val corePoolSize = gauge("core-pool-size", tpe.getCorePoolSize.toLong) + val maxPoolSize = gauge("max-pool-size", tpe.getMaximumPoolSize.toLong) + val poolSize = gauge("pool-size", tpe.getPoolSize.toLong) + val activeThreads = gauge("active-threads", tpe.getActiveCount.toLong) + val processedTasks = gauge("processed-tasks", DifferentialValueCollector(() ⇒ { + tpe.getTaskCount + })) +} + +object ThreadPoolExecutorMetrics { + def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorMetrics] { + def category: String = ExecutorServiceMetrics.Category + def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorMetrics(tpe, instrumentFactory) + } +} + +object ExecutorServiceMetrics { + val Category = "thread-pool-executors" + + def register(name: String, tpe: ThreadPoolExecutor): Unit = { + Kamon.metrics.entity(ThreadPoolExecutorMetrics.factory(tpe), Entity(name, Category)) + } + + def register(name: String, fjp: ForkJoinPool): Unit = { + Kamon.metrics.entity(ForkJoinPoolMetrics.factory(fjp), Entity(name, Category)) + } + + def register(name: String, jfjp: JavaForkJoinPool): Unit = { + Kamon.metrics.entity(JavaForkJoinPoolMetrics.factory(jfjp), Entity(name, Category)) + } +} diff --git a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala index 553d59ed..81e8fb8b 100644 --- a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala +++ b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala @@ -14,7 +14,7 @@ * ========================================================================================= */ -package kamon.http +package kamon.util.http import kamon.metric.{ EntityRecorderFactory, GenericEntityRecorder } import kamon.metric.instrument.InstrumentFactory diff --git a/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala b/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala index 58153937..d8ef5c97 100644 --- a/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala +++ b/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala @@ -19,7 +19,7 @@ package kamon.play import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import akka.event.Logging import kamon.Kamon -import kamon.http.HttpServerMetrics +import kamon.util.http.HttpServerMetrics import play.api.libs.ws.WSRequest import play.api.mvc.RequestHeader diff --git a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala index c8177610..db05f29f 100644 --- a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala +++ b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala @@ -19,7 +19,7 @@ package kamon.play import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import akka.event.Logging import kamon.Kamon -import kamon.http.HttpServerMetrics +import kamon.util.http.HttpServerMetrics import play.api.libs.ws.WSRequest import play.api.mvc.RequestHeader diff --git a/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala b/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala index ebf79496..044d2884 100644 --- a/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala +++ b/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala @@ -20,7 +20,7 @@ import akka.actor.{ ExtendedActorSystem, ExtensionIdProvider, ExtensionId } import akka.actor import akka.event.{ Logging, LoggingAdapter } import kamon.Kamon -import kamon.http.HttpServerMetrics +import kamon.util.http.HttpServerMetrics import kamon.metric.Entity import spray.http.HttpHeaders.Host import spray.http.HttpRequest diff --git a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala index 9d2a5b94..6ace80cc 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala @@ -55,11 +55,9 @@ class SystemMetricsExtension(system: ExtendedActorSystem) extends Kamon.Extensio // JMX Metrics if (jmxEnabled) { - MemoryPoolMetrics.register(metricsExtension) + MemoryUsageMetrics.register(metricsExtension) ClassLoadingMetrics.register(metricsExtension) GarbageCollectionMetrics.register(metricsExtension) - HeapMemoryMetrics.register(metricsExtension) - NonHeapMemoryMetrics.register(metricsExtension) ThreadsMetrics.register(metricsExtension) } } diff --git a/kamon-system-metrics/src/main/scala/kamon/system/jmx/HeapMemoryMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/jmx/HeapMemoryMetrics.scala deleted file mode 100644 index cd2e3e8e..00000000 --- a/kamon-system-metrics/src/main/scala/kamon/system/jmx/HeapMemoryMetrics.scala +++ /dev/null @@ -1,49 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2015 the kamon project <http://kamon.io/> - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -package kamon.system.jmx - -import java.lang.management.ManagementFactory - -import kamon.metric.GenericEntityRecorder -import kamon.metric.instrument.{ Memory, InstrumentFactory } - -/** - * Heap Memory metrics, as reported by JMX: - * - @see [[http://docs.oracle.com/javase/7/docs/api/java/lang/management/MemoryMXBean.html "MemoryMXBean"]] - */ -class HeapMemoryMetrics(instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { - val memoryBean = ManagementFactory.getMemoryMXBean - def nonHeapUsage = memoryBean.getHeapMemoryUsage - - gauge("heap-used", Memory.Bytes, () ⇒ { - nonHeapUsage.getUsed - }) - - gauge("heap-max", Memory.Bytes, () ⇒ { - nonHeapUsage.getMax - }) - - gauge("heap-committed", Memory.Bytes, () ⇒ { - nonHeapUsage.getCommitted - }) - -} - -object HeapMemoryMetrics extends JmxSystemMetricRecorderCompanion("heap-memory") { - def apply(instrumentFactory: InstrumentFactory): HeapMemoryMetrics = - new HeapMemoryMetrics(instrumentFactory) -} diff --git a/kamon-system-metrics/src/main/scala/kamon/system/jmx/MemoryPoolMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/jmx/MemoryUsageMetrics.scala index 8c2d2293..ef9d47a6 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/jmx/MemoryPoolMetrics.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/jmx/MemoryUsageMetrics.scala @@ -16,29 +16,29 @@ package kamon.system.jmx -import java.lang.management.{ ManagementFactory, MemoryPoolMXBean } +import java.lang.management.{ MemoryUsage, MemoryMXBean, ManagementFactory, MemoryPoolMXBean } import kamon.metric.GenericEntityRecorder -import kamon.metric.instrument.{ InstrumentFactory, Memory } +import kamon.metric.instrument.{ Memory, InstrumentFactory } import scala.collection.convert.WrapAsScala /** - * Generic memory pool stat recorder. - * Records the amount of used, max, and committed memory in bytes for each passed MemoryPoolMXBean. + * Generic memory usage stat recorder. + * Records the amount of used, max, and committed memory in bytes for each passed MemoryUsage. * @param instrumentFactory Helpers for metric recording. * @param beansWithNames Data sources with metric name prefixes. */ -class MemoryPoolMetrics(instrumentFactory: InstrumentFactory, - beansWithNames: Iterable[MemoryBeanWithMetricName]) extends GenericEntityRecorder(instrumentFactory) { +class MemoryUsageMetrics(instrumentFactory: InstrumentFactory, + beansWithNames: Iterable[MemoryUsageWithMetricName]) extends GenericEntityRecorder(instrumentFactory) { beansWithNames.foreach { - case MemoryBeanWithMetricName(name, bean) ⇒ + case MemoryUsageWithMetricName(name, bean) ⇒ gauge(name + "-used", Memory.Bytes, () ⇒ { - bean.getUsage.getUsed + bean.getUsed }) gauge(name + "-max", Memory.Bytes, () ⇒ { - val max = bean.getUsage.getMax + val max = bean.getMax // .getMax can return -1 if the max is not defined. if (max >= 0) max @@ -46,17 +46,17 @@ class MemoryPoolMetrics(instrumentFactory: InstrumentFactory, }) gauge(name + "-committed", Memory.Bytes, () ⇒ { - bean.getUsage.getCommitted + bean.getCommitted }) } } /** - * Objects of this kind may be passed to [[MemoryPoolMetrics]] for data collection. - * @param metricName The sanitized name of a [[MemoryPoolMXBean]]. + * Objects of this kind may be passed to instances of [[MemoryUsageMetrics]] for data collection. + * @param metricName The sanitized name for a metric. * @param bean The data source for metrics. */ -private[jmx] final case class MemoryBeanWithMetricName(metricName: String, bean: MemoryPoolMXBean) +private[jmx] final case class MemoryUsageWithMetricName(metricName: String, bean: MemoryUsage) /** * Memory Pool metrics, as reported by JMX: @@ -64,17 +64,22 @@ private[jmx] final case class MemoryBeanWithMetricName(metricName: String, bean: * Pools in HotSpot Java 8: * code-cache, metaspace, compressed-class-space, ps-eden-space, ps-survivor-space, ps-old-gen */ -object MemoryPoolMetrics extends JmxSystemMetricRecorderCompanion("memory-pool") with WrapAsScala { +object MemoryUsageMetrics extends JmxSystemMetricRecorderCompanion("jmx-memory") with WrapAsScala { private val invalidChars = """[^a-z0-9]""".r private def sanitizedName(memoryPoolMXBean: MemoryPoolMXBean) = invalidChars.replaceAllIn(memoryPoolMXBean.getName.toLowerCase, "-") - private val beansWithNames = ManagementFactory.getMemoryPoolMXBeans.toIterable.map { bean ⇒ - MemoryBeanWithMetricName(sanitizedName(bean), bean) + private val usagesWithNames = ManagementFactory.getMemoryPoolMXBeans.toList.map { bean ⇒ + MemoryUsageWithMetricName(sanitizedName(bean), bean.getUsage) } - def apply(instrumentFactory: InstrumentFactory): MemoryPoolMetrics = - new MemoryPoolMetrics(instrumentFactory, beansWithNames) + private val memoryMXBean: MemoryMXBean = ManagementFactory.getMemoryMXBean + + def apply(instrumentFactory: InstrumentFactory): MemoryUsageMetrics = + new MemoryUsageMetrics(instrumentFactory, + MemoryUsageWithMetricName("non-heap", memoryMXBean.getNonHeapMemoryUsage) :: + MemoryUsageWithMetricName("heap", memoryMXBean.getHeapMemoryUsage) :: + usagesWithNames) } diff --git a/kamon-system-metrics/src/main/scala/kamon/system/jmx/NonHeapMemoryMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/jmx/NonHeapMemoryMetrics.scala deleted file mode 100644 index 7425972b..00000000 --- a/kamon-system-metrics/src/main/scala/kamon/system/jmx/NonHeapMemoryMetrics.scala +++ /dev/null @@ -1,53 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2015 the kamon project <http://kamon.io/> - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -package kamon.system.jmx - -import java.lang.management.ManagementFactory - -import kamon.metric.GenericEntityRecorder -import kamon.metric.instrument.{ Memory, InstrumentFactory } - -/** - * Non Heap Memory metrics, as reported by JMX: - * - @see [[http://docs.oracle.com/javase/7/docs/api/java/lang/management/MemoryMXBean.html "MemoryMXBean"]] - */ -class NonHeapMemoryMetrics(instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { - val memoryBean = ManagementFactory.getMemoryMXBean - def nonHeapUsage = memoryBean.getNonHeapMemoryUsage - - gauge("non-heap-used", Memory.Bytes, () ⇒ { - nonHeapUsage.getUsed - }) - - gauge("non-heap-max", Memory.Bytes, () ⇒ { - val max = nonHeapUsage.getMax - - // .getMax can return -1 if the max is not defined. - if (max >= 0) max - else 0 - }) - - gauge("non-heap-committed", Memory.Bytes, () ⇒ { - nonHeapUsage.getCommitted - }) - -} - -object NonHeapMemoryMetrics extends JmxSystemMetricRecorderCompanion("non-heap-memory") { - def apply(instrumentFactory: InstrumentFactory): NonHeapMemoryMetrics = - new NonHeapMemoryMetrics(instrumentFactory) -} diff --git a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala index 4d633952..7af704d5 100644 --- a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala +++ b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala @@ -62,20 +62,16 @@ class SystemMetricsSpec extends BaseKamonSpec("system-metrics-spec") with Redire } } - "record used, max and committed heap metrics" in { - val heapMetrics = takeSnapshotOf("heap-memory", "system-metric") + "record used, max and committed heap and non-heap metrics" in { + val memoryMetrics = takeSnapshotOf("jmx-memory", "system-metric") - heapMetrics.gauge("heap-used").get.numberOfMeasurements should be > 0L - heapMetrics.gauge("heap-max").get.numberOfMeasurements should be > 0L - heapMetrics.gauge("heap-committed").get.numberOfMeasurements should be > 0L - } - - "record used, max and committed non-heap metrics" in { - val nonHeapMetrics = takeSnapshotOf("non-heap-memory", "system-metric") + memoryMetrics.gauge("heap-used").get.numberOfMeasurements should be > 0L + memoryMetrics.gauge("heap-max").get.numberOfMeasurements should be > 0L + memoryMetrics.gauge("heap-committed").get.numberOfMeasurements should be > 0L - nonHeapMetrics.gauge("non-heap-used").get.numberOfMeasurements should be > 0L - nonHeapMetrics.gauge("non-heap-max").get.numberOfMeasurements should be > 0L - nonHeapMetrics.gauge("non-heap-committed").get.numberOfMeasurements should be > 0L + memoryMetrics.gauge("non-heap-used").get.numberOfMeasurements should be > 0L + memoryMetrics.gauge("non-heap-max").get.numberOfMeasurements should be > 0L + memoryMetrics.gauge("non-heap-committed").get.numberOfMeasurements should be > 0L } "record daemon, count and peak jvm threads metrics" in { |