aboutsummaryrefslogtreecommitdiff
path: root/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
diff options
context:
space:
mode:
authorFerenc Toth <feri@gawker.com>2015-08-21 09:19:10 +0200
committerFerenc Toth <feri@gawker.com>2015-08-25 10:15:11 +0200
commit2668550433cc0629affc7e74daa4693634965a4e (patch)
treed151772295ca642d6f7f6975a059bf42c1986898 /kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
parentb1efc3ba5d981b7fe1e1a21af41081517e17c9fe (diff)
downloadKamon-2668550433cc0629affc7e74daa4693634965a4e.tar.gz
Kamon-2668550433cc0629affc7e74daa4693634965a4e.tar.bz2
Kamon-2668550433cc0629affc7e74daa4693634965a4e.zip
= system-metrics: Generic mem metrics
= use generalized entity recorder = merge memory metrics = update tests
Diffstat (limited to 'kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala')
-rw-r--r--kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala20
1 files changed, 8 insertions, 12 deletions
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 {