[GR-55268] Report units in custom JFR NMT events.

PullRequest: graal/18275

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/NativeMemoryUsagePeakEvent.java

@@ -26,6 +26,7 @@
 package com.oracle.svm.core.jfr.events;
 
 import jdk.jfr.Category;
+import jdk.jfr.DataAmount;
 import jdk.jfr.Description;
 import jdk.jfr.Event;
 import jdk.jfr.Experimental;
@@ -41,8 +42,17 @@
 @Category({"Java Virtual Machine", "Memory"})
 @StackTrace(false)
 public class NativeMemoryUsagePeakEvent extends Event {
-    @Label("Memory Type") public String type;
-    @Label("Peak Reserved") public long peakReserved;
-    @Label("Peak Committed") public long peakCommitted;
-    @Label("Count At Peak") public long countAtPeak;
+    @Label("Memory Type")//
+    public String type;
+
+    @Label("Peak Reserved")//
+    @DataAmount//
+    public long peakReserved;
+
+    @Label("Peak Committed")//
+    @DataAmount//
+    public long peakCommitted;
+
+    @Label("Count At Peak")//
+    public long countAtPeak;
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/NativeMemoryUsageTotalPeakEvent.java

@@ -26,6 +26,7 @@
 package com.oracle.svm.core.jfr.events;
 
 import jdk.jfr.Category;
+import jdk.jfr.DataAmount;
 import jdk.jfr.Description;
 import jdk.jfr.Event;
 import jdk.jfr.Experimental;
@@ -41,7 +42,14 @@
 @Category({"Java Virtual Machine", "Memory"})
 @StackTrace(false)
 public class NativeMemoryUsageTotalPeakEvent extends Event {
-    @Label("Peak Reserved") public long peakReserved;
-    @Label("Peak Committed") public long peakCommitted;
-    @Label("Count At Peak") public long countAtPeak;
+    @Label("Peak Reserved")//
+    @DataAmount//
+    public long peakReserved;
+
+    @Label("Peak Committed")//
+    @DataAmount//
+    public long peakCommitted;
+
+    @Label("Count At Peak")//
+    public long countAtPeak;
 }