Skip to content

Commit e2fda8d

Browse files
COH-33158: MetricsSupportTests.shouldGetPlatformMemoryMetrics is failing with JDK 26
(auto-submit 119117 after successfully running remote remote.full) Job ID: job.9.20260307055654.20463 (auto-submit integ 119131 main -> coherence-ce/main after successfully running remote remote.full) Job ID: job.9.20260312142655.12409 [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 119202]
1 parent 0b16be4 commit e2fda8d

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

prj/test/functional/core/src/main/java/com/tangosol/internal/metrics/MetricsSupportTests.java

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2026, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
55
* https://oss.oracle.com/licenses/upl.
@@ -693,17 +693,25 @@ public void shouldGetPlatformMemoryMetrics()
693693

694694
Map<String, String> mapTags = getCommonTagsWithNodeId();
695695

696+
List<String> listExpectedMetrics =
697+
new ArrayList<>(Arrays.asList("Coherence.Memory.ObjectPendingFinalizationCount",
698+
"Coherence.Memory.HeapMemoryUsage.committed",
699+
"Coherence.Memory.HeapMemoryUsage.init",
700+
"Coherence.Memory.HeapMemoryUsage.max",
701+
"Coherence.Memory.HeapMemoryUsage.used",
702+
"Coherence.Memory.NonHeapMemoryUsage.committed",
703+
"Coherence.Memory.NonHeapMemoryUsage.init",
704+
"Coherence.Memory.NonHeapMemoryUsage.max",
705+
"Coherence.Memory.NonHeapMemoryUsage.used"));
706+
707+
if (s_bTestJdk26)
708+
{
709+
listExpectedMetrics.add("Coherence.Memory.TotalGcCpuTime");
710+
}
711+
696712
assertMetricsWithoutAfterGC(adapter.getMetrics(),
697713
mapTags,
698-
"Coherence.Memory.ObjectPendingFinalizationCount",
699-
"Coherence.Memory.HeapMemoryUsage.committed",
700-
"Coherence.Memory.HeapMemoryUsage.init",
701-
"Coherence.Memory.HeapMemoryUsage.max",
702-
"Coherence.Memory.HeapMemoryUsage.used",
703-
"Coherence.Memory.NonHeapMemoryUsage.committed",
704-
"Coherence.Memory.NonHeapMemoryUsage.init",
705-
"Coherence.Memory.NonHeapMemoryUsage.max",
706-
"Coherence.Memory.NonHeapMemoryUsage.used");
714+
listExpectedMetrics.toArray(new String[0]));
707715
}
708716

709717
@Test
@@ -1039,6 +1047,11 @@ public void remove(MBeanMetric.Identifier identifier)
10391047
*/
10401048
private static final Boolean s_bTestJdk15 = Integer.parseInt(System.getProperty("java.version").split("-|\\.")[0]) > 14;
10411049

1050+
/**
1051+
* True iff JVM is for JDK 26 or greater.
1052+
*/
1053+
private static final Boolean s_bTestJdk26 = Integer.parseInt(System.getProperty("java.version").split("-|\\.")[0]) > 25;
1054+
10421055
// ----- data members ---------------------------------------------------
10431056

10441057
private static Registry s_registry;

0 commit comments

Comments
 (0)