Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ void testAllJvmMetrics() {
.containsAll(allMetrics.stream().map(MetricToAssert::name).toList());
});

Set<String> flakyMetrics = new HashSet<>();
flakyMetrics.add("jvm.memory.used_after_last_gc");
flakyMetrics.add("jvm.cpu.limit");
flakyMetrics.add("jvm.cpu.recent_utilization");
flakyMetrics.add("jvm.system.cpu.utilization");
if (JdkUtil.isSemeru()) {
// this one has been flaky on CI with Semeru
flakyMetrics.add("jvm.memory.used");
}

allMetrics.forEach(metricToAssert -> {

// metric is there and has at least 1 reading
Expand All @@ -113,11 +123,7 @@ void testAllJvmMetrics() {
.hasSizeGreaterThan(0));

// skip assertions from flaky metrics
if (!metricToAssert.name().equals("jvm.memory.used_after_last_gc") &&
!metricToAssert.name().equals("jvm.cpu.limit") &&
!metricToAssert.name().equals("jvm.cpu.recent_utilization") &&
!metricToAssert.name().equals("jvm.system.cpu.utilization")) {

if (!flakyMetrics.contains(metricToAssert.name())) {
// Correct values might take some time to register
await().atMost(10, SECONDS).untilAsserted(() -> assertThat(getLastReading(metricToAssert))
.withFailMessage("Metric must be greater than 0: " + metricToAssert.name)
Expand Down
Loading