Support ZGC metric is OAP and UI (#8425)

Co-authored-by: Nlitexu <litexu@tencent.com>
Co-authored-by: 吴晟 Wu Sheng <wu.sheng@foxmail.com>

CHANGES.md

@@ -29,6 +29,7 @@ Release Notes.
 * Follow protocol grammar fix `GCPhrase -> GCPhase`.
 * Set layer to mesh relation.
 * Add `FAAS` to SpanLayer.
+* Support ZGC GC time and count metric collecting
 
 #### UI
 

oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/jvm/JVMSourceDispatcher.java

@@ -107,6 +107,9 @@ public class JVMSourceDispatcher {
                 case OLD:
                     serviceInstanceJVMGC.setPhase(GCPhase.OLD);
                     break;
+                case NORMAL:
+                    serviceInstanceJVMGC.setPhase(GCPhase.NORMAL);
+                    break;
             }
 
             serviceInstanceJVMGC.setTime(gc.getTime());

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/GCPhase.java

@@ -19,5 +19,5 @@
 package org.apache.skywalking.oap.server.core.source;
 
 public enum GCPhase {
-    NEW, OLD
+    NEW, OLD, NORMAL
 }

oap-server/server-starter/src/main/resources/oal/java-agent.oal

@@ -24,8 +24,10 @@ instance_jvm_memory_heap_max = from(ServiceInstanceJVMMemory.max).filter(heapSta
 instance_jvm_memory_noheap_max = from(ServiceInstanceJVMMemory.max).filter(heapStatus == false).longAvg();
 instance_jvm_young_gc_time = from(ServiceInstanceJVMGC.time).filter(phase == GCPhase.NEW).sum();
 instance_jvm_old_gc_time = from(ServiceInstanceJVMGC.time).filter(phase == GCPhase.OLD).sum();
+instance_jvm_normal_gc_time = from(ServiceInstanceJVMGC.time).filter(phase == GCPhase.NORMAL).sum();
 instance_jvm_young_gc_count = from(ServiceInstanceJVMGC.count).filter(phase == GCPhase.NEW).sum();
 instance_jvm_old_gc_count = from(ServiceInstanceJVMGC.count).filter(phase == GCPhase.OLD).sum();
+instance_jvm_normal_gc_count = from(ServiceInstanceJVMGC.count).filter(phase == GCPhase.NORMAL).sum();
 instance_jvm_thread_live_count = from(ServiceInstanceJVMThread.liveCount).longAvg();
 instance_jvm_thread_daemon_count = from(ServiceInstanceJVMThread.daemonCount).longAvg();
 instance_jvm_thread_peak_count = from(ServiceInstanceJVMThread.peakCount).longAvg();

oap-server/server-starter/src/main/resources/ui-initialized-templates/apm.yml

@@ -399,7 +399,7 @@ templates:
                   "entityType": "ServiceInstance",
                   "independentSelector": false,
                   "metricType": "REGULAR_VALUE",
-                  "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time",
+                  "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time, instance_jvm_normal_gc_time",
                   "queryMetricType": "readMetricsValues",
                   "chartType": "ChartLine",
                   "unit": "ms"
@@ -413,7 +413,7 @@ templates:
                   "metricType": "REGULAR_VALUE",
                   "queryMetricType": "readMetricsValues",
                   "chartType": "ChartBar",
-                  "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count"
+                  "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count, instance_jvm_normal_gc_count"
                 },
                 {
                   "width": 3,

oap-server/server-starter/src/main/resources/ui-initialized-templates/topology-instance.yml

@@ -101,7 +101,7 @@ templates:
             "entityType": "ServiceInstance",
             "independentSelector": false,
             "metricType": "REGULAR_VALUE",
-            "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time",
+            "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time, instance_jvm_normal_gc_time",
             "queryMetricType": "readMetricsValues",
             "chartType": "ChartLine",
             "unit": "ms"
@@ -115,7 +115,7 @@ templates:
             "metricType": "REGULAR_VALUE",
             "queryMetricType": "readMetricsValues",
             "chartType": "ChartBar",
-            "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count"
+            "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count, instance_jvm_normal_gc_count"
           },
           {
             "width": 3,
@@ -238,7 +238,7 @@ templates:
             "entityType": "ServiceInstance",
             "independentSelector": false,
             "metricType": "REGULAR_VALUE",
-            "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time",
+            "metricName": "instance_jvm_young_gc_time, instance_jvm_old_gc_time, instance_jvm_normal_gc_time",
             "queryMetricType": "readMetricsValues",
             "chartType": "ChartLine",
             "unit": "ms"
@@ -252,7 +252,7 @@ templates:
             "metricType": "REGULAR_VALUE",
             "queryMetricType": "readMetricsValues",
             "chartType": "ChartBar",
-            "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count"
+            "metricName": "instance_jvm_young_gc_count, instance_jvm_old_gc_count, instance_jvm_normal_gc_count"
           },
           {
             "width": 3,