Updated Generational ZGC to use Major and Minor GC metric names

DataDog · Jan 4, 2024 · 86d1f74 · 86d1f74
1 parent f71b32e
commit 86d1f74
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 # 0.49.1 / TBD
-* [FEATURE] Add ZGC Major and Minor Cycles and ZGC Major and Minor Pauses beans support out of the box (Generational ZGC support) [#502][]
+* [FEATURE] Add ZGC Major and Minor Cycles and ZGC Major and Minor Pauses beans support out of the box (Generational ZGC support) [#509][]
 
 # 0.49.0 / 2023-11-10
 * [FEATURE] Adds more per-instance telemetry data around bean matching
@@ -762,7 +762,7 @@ Changelog
 [#449]: https://github.com/DataDog/jmxfetch/issues/449
 [#469]: https://github.com/DataDog/jmxfetch/issues/469
 [#477]: https://github.com/DataDog/jmxfetch/issues/477
-[#502]: https://github.com/DataDog/jmxfetch/issues/502
+[#509]: https://github.com/DataDog/jmxfetch/issues/509
 [@alz]: https://github.com/alz
 [@aoking]: https://github.com/aoking
 [@arrawatia]: https://github.com/arrawatia

diff --git a/src/main/resources/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml b/src/main/resources/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml
@@ -1,4 +1,4 @@
-
+---
 # Young Gen Collectors (Minor Collections)
 - include:
     domain: java.lang
@@ -155,41 +155,41 @@
     name: ZGC Major Cycles
     attribute:
       CollectionCount:
-        alias: jvm.gc.zgc_cycles_collection_count
+        alias: jvm.gc.major_collection_count
         metric_type: counter
       CollectionTime:
-        alias: jvm.gc.zgc_cycles_collection_time
+        alias: jvm.gc.major_collection_time
         metric_type: counter
 - include:
     domain: java.lang
     type: GarbageCollector
     name: ZGC Major Pauses
     attribute:
       CollectionCount:
-        alias: jvm.gc.zgc_pauses_collection_count
+        alias: jvm.gc.major_collection_count
         metric_type: counter
       CollectionTime:
-        alias: jvm.gc.zgc_pauses_collection_time
+        alias: jvm.gc.major_collection_time
         metric_type: counter
 - include:
     domain: java.lang
     type: GarbageCollector
     name: ZGC Minor Cycles
     attribute:
       CollectionCount:
-        alias: jvm.gc.zgc_cycles_collection_count
+        alias: jvm.gc.minor_collection_count
         metric_type: counter
       CollectionTime:
-        alias: jvm.gc.zgc_cycles_collection_time
+        alias: jvm.gc.minor_collection_time
         metric_type: counter
 - include:
     domain: java.lang
     type: GarbageCollector
     name: ZGC Minor Pauses
     attribute:
       CollectionCount:
-        alias: jvm.gc.zgc_pauses_collection_count
+        alias: jvm.gc.minor_collection_count
         metric_type: counter
       CollectionTime:
-        alias: jvm.gc.zgc_pauses_collection_time
-        metric_type: counter
+        alias: jvm.gc.minor_collection_time
+        metric_type: counter
diff --git a/src/test/java/org/datadog/jmxfetch/TestGCMetrics.java b/src/test/java/org/datadog/jmxfetch/TestGCMetrics.java
@@ -136,15 +136,15 @@ public void testDefaultNewGCMetricsUseGenerationalZGC() throws IOException {
             assertThat(actualMetrics, hasSize(17));
             final List<String> gcCycles = Arrays.asList(
                 "ZGC Major Cycles",
-                "ZGC Minor Cycles");
-            assertGCMetric(actualMetrics, "jvm.gc.zgc_cycles_collection_count", gcCycles);
-            assertGCMetric(actualMetrics, "jvm.gc.zgc_cycles_collection_time", gcCycles);
+                "ZGC Major Pauses");
+            assertGCMetric(actualMetrics, "jvm.gc.major_collection_count", gcCycles);
+            assertGCMetric(actualMetrics, "jvm.gc.major_collection_time", gcCycles);
 
             final List<String> gcPauses = Arrays.asList(
-                "ZGC Major Pauses",
+                "ZGC Minor Cycles",
                 "ZGC Minor Pauses");
-            assertGCMetric(actualMetrics, "jvm.gc.zgc_pauses_collection_count", gcPauses);
-            assertGCMetric(actualMetrics, "jvm.gc.zgc_pauses_collection_time", gcPauses);
+            assertGCMetric(actualMetrics, "jvm.gc.minor_collection_count", gcPauses);
+            assertGCMetric(actualMetrics, "jvm.gc.minor_collection_time", gcPauses);
         }
     }