[Fix-17173] [JVM Metrics] Fix JVM memory monitoring metrics (#17174)

Author: dill21yu

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/BaseHeartBeat.java

@@ -36,6 +36,10 @@ public class BaseHeartBeat implements HeartBeat {
     protected double jvmCpuUsage;
     protected double cpuUsage;
     protected double jvmMemoryUsage;
+    private double jvmHeapUsed;
+    private double jvmNonHeapUsed;
+    private double jvmHeapMax;
+    private double jvmNonHeapMax;
     protected double memoryUsage;
     protected double diskUsage;
     protected ServerStatus serverStatus;

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterHeartBeatTask.java

@@ -74,6 +74,10 @@ public MasterHeartBeat getHeartBeat() {
                 .jvmCpuUsage(systemMetrics.getJvmCpuUsagePercentage())
                 .cpuUsage(systemMetrics.getSystemCpuUsagePercentage())
                 .jvmMemoryUsage(systemMetrics.getJvmMemoryUsedPercentage())
+                .jvmHeapUsed(systemMetrics.getJvmHeapUsed())
+                .jvmHeapMax(systemMetrics.getJvmHeapMax())
+                .jvmNonHeapUsed(systemMetrics.getJvmNonHeapUsed())
+                .jvmNonHeapMax(systemMetrics.getJvmNonHeapMax())
                 .memoryUsage(systemMetrics.getSystemMemoryUsedPercentage())
                 .diskUsage(systemMetrics.getDiskUsedPercentage())
                 .processId(processId)

dolphinscheduler-meter/src/main/java/org/apache/dolphinscheduler/meter/metrics/DefaultMetricsProvider.java

@@ -20,6 +20,7 @@
 import org.apache.dolphinscheduler.common.utils.OSUtils;
 
 import lombok.extern.slf4j.Slf4j;
+import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MeterRegistry;
 
 @Slf4j
@@ -59,8 +60,19 @@ public SystemMetrics getSystemMetrics() {
             lastProcessCpuUsage = processCpuUsage;
         }
 
-        double jvmMemoryUsed = meterRegistry.get("jvm.memory.used").meter().measure().iterator().next().getValue();
-        double jvmMemoryMax = meterRegistry.get("jvm.memory.max").meter().measure().iterator().next().getValue();
+        // Calculate JVM memory usage and maximum values
+        double jvmHeapUsed = calculateTotalMemory(meterRegistry, "heap", "jvm.memory.used");
+        double jvmNonHeapUsed = calculateTotalMemory(meterRegistry, "nonheap", "jvm.memory.used");
+
+        double jvmHeapMax = calculateTotalMemory(meterRegistry, "heap", "jvm.memory.max");
+        double jvmNonHeapMax = calculateTotalMemory(meterRegistry, "nonheap", "jvm.memory.max");
+
+        // Calculate totals
+        double jvmMemoryUsed = jvmHeapUsed + jvmNonHeapUsed;
+        double jvmMemoryMax = jvmHeapMax + jvmNonHeapMax;
+
+        // Ensure jvmMemoryMax is not zero
+        double jvmMemoryUsedPercentage = (jvmMemoryMax > 0) ? (jvmMemoryUsed / jvmMemoryMax) : 0.0;
 
         long totalSystemMemory = OSUtils.getTotalSystemMemory();
         long systemMemoryAvailable = OSUtils.getSystemAvailableMemoryUsed();
@@ -73,7 +85,11 @@ public SystemMetrics getSystemMetrics() {
                 .jvmCpuUsagePercentage(processCpuUsage)
                 .jvmMemoryUsed(jvmMemoryUsed)
                 .jvmMemoryMax(jvmMemoryMax)
-                .jvmMemoryUsedPercentage(jvmMemoryUsed / jvmMemoryMax)
+                .jvmHeapUsed(jvmHeapUsed)
+                .jvmHeapMax(jvmHeapMax)
+                .jvmNonHeapUsed(jvmNonHeapUsed)
+                .jvmNonHeapMax(jvmNonHeapMax)
+                .jvmMemoryUsedPercentage(jvmMemoryUsedPercentage)
                 .systemMemoryUsed(totalSystemMemory - systemMemoryAvailable)
                 .systemMemoryMax(totalSystemMemory)
                 .systemMemoryUsedPercentage((double) (totalSystemMemory - systemMemoryAvailable) / totalSystemMemory)
@@ -85,4 +101,29 @@ public SystemMetrics getSystemMetrics() {
         return systemMetrics;
     }
 
+    /**
+     * Calculate the total memory usage for a specified area
+     * This method calculates the total memory usage by iterating over all meters in the MeterRegistry that match the given name
+     * It only sums up meters that have the same area tag and a value greater than 0
+     *
+     * @param meterRegistry A MeterRegistry instance used to retrieve memory data
+     * @param area          The memory area type ("heap" or "nonheap")
+     * @param name          The meter name to match, used to find related meters in the MeterRegistry
+     * @return The total memory usage for the specified area
+     */
+    private double calculateTotalMemory(MeterRegistry meterRegistry, String area, String name) {
+        double memory = 0.0;
+        Iterable<Meter> meters = meterRegistry.find(name).meters();
+        for (Meter meter : meters) {
+            if (area.equals(meter.getId().getTag("area"))) {
+                double value = meter.measure().iterator().next().getValue();
+                // Ignore undefined maximum values (-1)
+                if (value > 0) {
+                    memory += value;
+                }
+            }
+        }
+        return memory;
+    }
+
 }

dolphinscheduler-meter/src/main/java/org/apache/dolphinscheduler/meter/metrics/SystemMetrics.java

@@ -36,6 +36,10 @@ public class SystemMetrics {
     // todo: get pod memory usage
     private double jvmMemoryUsed;
     private double jvmMemoryMax;
+    private double jvmHeapUsed;
+    private double jvmNonHeapUsed;
+    private double jvmHeapMax;
+    private double jvmNonHeapMax;
     private double jvmMemoryUsedPercentage;
 
     // System-Memory

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java

@@ -71,6 +71,10 @@ public WorkerHeartBeat getHeartBeat() {
                 .jvmCpuUsage(systemMetrics.getJvmCpuUsagePercentage())
                 .cpuUsage(systemMetrics.getSystemCpuUsagePercentage())
                 .jvmMemoryUsage(systemMetrics.getJvmMemoryUsedPercentage())
+                .jvmHeapUsed(systemMetrics.getJvmHeapUsed())
+                .jvmHeapMax(systemMetrics.getJvmHeapMax())
+                .jvmNonHeapUsed(systemMetrics.getJvmNonHeapUsed())
+                .jvmNonHeapMax(systemMetrics.getJvmNonHeapMax())
                 .memoryUsage(systemMetrics.getSystemMemoryUsedPercentage())
                 .diskUsage(systemMetrics.getDiskUsedPercentage())
                 .processId(processId)