Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMLII-1358 - Updated Generational ZGC to use Major and Minor GC metric names #509

Merged
merged 1 commit into from
Jan 4, 2024
Merged

AMLII-1358 - Updated Generational ZGC to use Major and Minor GC metric names #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions src/main/resources/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

---
# Young Gen Collectors (Minor Collections)
- include:
domain: java.lang
Expand Down Expand Up @@ -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
12 changes: 6 additions & 6 deletions src/test/java/org/datadog/jmxfetch/TestGCMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Loading