update jmx gatherer for consistency

Author: SylvainJuge

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java

@@ -31,13 +31,13 @@ void endToEnd() {
             "Metaspace",
             "Par Survivor Space");
     waitAndAssertMetrics(
-        metric -> assertGauge(metric, "jvm.classes.loaded", "number of loaded classes", "1"),
+        metric -> assertGauge(metric, "jvm.classes.loaded", "number of loaded classes", "{class}"),
         metric ->
             assertTypedSum(
                 metric,
                 "jvm.gc.collections.count",
                 "total number of collections that have occurred",
-                "1",
+                "{collection}",
                 Arrays.asList("ConcurrentMarkSweep", "ParNew")),
         metric ->
             assertTypedSum(
@@ -46,27 +46,27 @@ void endToEnd() {
                 "the approximate accumulated collection elapsed time in milliseconds",
                 "ms",
                 Arrays.asList("ConcurrentMarkSweep", "ParNew")),
-        metric -> assertGauge(metric, "jvm.memory.heap.committed", "current heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.heap.init", "current heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.heap.max", "current heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.heap.used", "current heap usage", "by"),
+        metric -> assertGauge(metric, "jvm.memory.heap.committed", "current heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.heap.init", "current heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.heap.max", "current heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.heap.used", "current heap usage", "By"),
         metric ->
-            assertGauge(metric, "jvm.memory.nonheap.committed", "current non-heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.nonheap.init", "current non-heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.nonheap.max", "current non-heap usage", "by"),
-        metric -> assertGauge(metric, "jvm.memory.nonheap.used", "current non-heap usage", "by"),
+            assertGauge(metric, "jvm.memory.nonheap.committed", "current non-heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.nonheap.init", "current non-heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.nonheap.max", "current non-heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.memory.nonheap.used", "current non-heap usage", "By"),
         metric ->
             assertTypedGauge(
-                metric, "jvm.memory.pool.committed", "current memory pool usage", "by", gcLabels),
+                metric, "jvm.memory.pool.committed", "current memory pool usage", "By", gcLabels),
         metric ->
             assertTypedGauge(
-                metric, "jvm.memory.pool.init", "current memory pool usage", "by", gcLabels),
+                metric, "jvm.memory.pool.init", "current memory pool usage", "By", gcLabels),
         metric ->
             assertTypedGauge(
-                metric, "jvm.memory.pool.max", "current memory pool usage", "by", gcLabels),
+                metric, "jvm.memory.pool.max", "current memory pool usage", "By", gcLabels),
         metric ->
             assertTypedGauge(
-                metric, "jvm.memory.pool.used", "current memory pool usage", "by", gcLabels),
-        metric -> assertGauge(metric, "jvm.threads.count", "number of threads", "1"));
+                metric, "jvm.memory.pool.used", "current memory pool usage", "By", gcLabels),
+        metric -> assertGauge(metric, "jvm.threads.count", "number of threads", "{thread}"));
   }
 }

jmx-metrics/src/main/resources/target-systems/jvm.groovy

@@ -16,11 +16,11 @@
 
 def classLoading = otel.mbean("java.lang:type=ClassLoading")
 otel.instrument(classLoading, "jvm.classes.loaded", "number of loaded classes",
-        "1", "LoadedClassCount", otel.&longValueCallback)
+        "{class}", "LoadedClassCount", otel.&longValueCallback)
 
 def garbageCollector = otel.mbeans("java.lang:type=GarbageCollector,*")
 otel.instrument(garbageCollector, "jvm.gc.collections.count", "total number of collections that have occurred",
-        "1", ["name" : { mbean -> mbean.name().getKeyProperty("name") }],
+        "{collection}", ["name" : { mbean -> mbean.name().getKeyProperty("name") }],
         "CollectionCount", otel.&longCounterCallback)
 otel.instrument(garbageCollector, "jvm.gc.collections.elapsed",
         "the approximate accumulated collection elapsed time in milliseconds", "ms",
@@ -29,15 +29,15 @@ otel.instrument(garbageCollector, "jvm.gc.collections.elapsed",
 
 def memory = otel.mbean("java.lang:type=Memory")
 otel.instrument(memory, "jvm.memory.heap", "current heap usage",
-        "by", "HeapMemoryUsage", otel.&longValueCallback)
+        "By", "HeapMemoryUsage", otel.&longValueCallback)
 otel.instrument(memory, "jvm.memory.nonheap", "current non-heap usage",
-        "by", "NonHeapMemoryUsage", otel.&longValueCallback)
+        "By", "NonHeapMemoryUsage", otel.&longValueCallback)
 
 def memoryPool = otel.mbeans("java.lang:type=MemoryPool,*")
 otel.instrument(memoryPool, "jvm.memory.pool", "current memory pool usage",
-        "by", ["name" : { mbean -> mbean.name().getKeyProperty("name") }],
+        "By", ["name" : { mbean -> mbean.name().getKeyProperty("name") }],
         "Usage", otel.&longValueCallback)
 
 def threading = otel.mbean("java.lang:type=Threading")
 otel.instrument(threading, "jvm.threads.count", "number of threads",
-        "1", "ThreadCount", otel.&longValueCallback)
+        "{thread}", "ThreadCount", otel.&longValueCallback)