take from jfr

fandreuz · fandreuz · commit 790b08607ece · 2025-05-20T13:39:39.000Z
diff --git a/test/test/jfr/JfrTests.java b/test/test/jfr/JfrTests.java
@@ -96,10 +96,17 @@ public void allModeNoEventOverride(TestProcess p) throws Exception {
         p.waitForExit();
         assert p.exitCode() == 0;
         Set<String> events = new HashSet<>();
+        String vmSpecificationVersion = null;
         try (RecordingFile recordingFile = new RecordingFile(p.getFile("%f").toPath())) {
             while (recordingFile.hasMoreEvents()) {
                 RecordedEvent event = recordingFile.readEvent();
                 String eventName = event.getEventType().getName();
+
+                if (eventName.equals("jdk.InitialSystemProperty") &&
+                    event.getString("key").equals("java.vm.specification.version")) {
+                    vmSpecificationVersion = event.getString("value");
+                }
+
                 events.add(eventName);
             }
         }
@@ -109,7 +116,7 @@ public void allModeNoEventOverride(TestProcess p) throws Exception {
         assert events.contains("jdk.JavaMonitorEnter"); // lock profiling
         assert events.contains("jdk.ObjectAllocationInNewTLAB"); // alloc profiling
         assert events.contains("profiler.WallClockSample"); // wall clock profiling
-        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(); // profiling of live objects
+        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(vmSpecificationVersion); // profiling of live objects
         assert events.contains("profiler.Malloc"); // nativemem profiling
         assert events.contains("profiler.Free"); // nativemem profiling
     }
@@ -128,10 +135,17 @@ public void allModeEventOverride(TestProcess p) throws Exception {
         p.waitForExit();
         assert p.exitCode() == 0;
         Set<String> events = new HashSet<>();
+        String vmSpecificationVersion = null;
         try (RecordingFile recordingFile = new RecordingFile(p.getFile("%f").toPath())) {
             while (recordingFile.hasMoreEvents()) {
                 RecordedEvent event = recordingFile.readEvent();
                 String eventName = event.getEventType().getName();
+
+                if (eventName.equals("jdk.InitialSystemProperty") &&
+                    event.getString("key").equals("java.vm.specification.version")) {
+                    vmSpecificationVersion = event.getString("value");
+                }
+
                 events.add(eventName);
                 if (eventName.equals("jdk.ExecutionSample")) {
                     // This means that only instrumented method was profiled and overall CPU profiling was skipped
@@ -142,7 +156,7 @@ public void allModeEventOverride(TestProcess p) throws Exception {
         assert events.contains("jdk.JavaMonitorEnter"); // lock profiling
         assert events.contains("jdk.ObjectAllocationInNewTLAB"); // alloc profiling
         assert events.contains("profiler.WallClockSample"); // wall clock profiling
-        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(); // profiling of live objects
+        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(vmSpecificationVersion); // profiling of live objects
         assert events.contains("profiler.Malloc"); // nativemem profiling
         assert events.contains("profiler.Free"); // nativemem profiling
     }
@@ -198,8 +212,10 @@ private boolean containsSamplesOutsideWindow(TestProcess p) throws Exception {
         });
     }
 
-    private static boolean checkJdkVersionEarlierThan11() {
-        String javaVersion = System.getProperty("java.version");
-        return javaVersion.startsWith("1.") || Integer.parseInt(javaVersion.split("\\.")[0]) < 11;
+    private static boolean checkJdkVersionEarlierThan11(String vmSpecificationVersion) {
+        if (vmSpecificationVersion == null) {
+            throw new IllegalArgumentException("vmSpecificationVersion should not be null");
+        }
+        return vmSpecificationVersion.startsWith("1.") || Integer.parseInt(vmSpecificationVersion.split("\\.")[0]) < 11;
     }
 }
