Merge branch 'metrics@@2' into 'master'

[Improvement: add more prometheus metrics]

See merge request zstackio/zstack!6113

Author: gitlab

core/src/main/java/org/zstack/core/cloudbus/CloudBus.java

@@ -97,4 +97,8 @@ default void handleHttpRequest(HttpEntity<String> e, HttpServletResponse rsp) {
     String HEADER_TASK_STACK = "task-stack";
     String HEADER_TASK_CONTEXT = "task-context";
     String HEADER_SCHEMA = "schema";
+
+    default int getEnvelopeSize() {
+        return 0;
+    }
 }

core/src/main/java/org/zstack/core/cloudbus/CloudBusImpl3.java

@@ -25,6 +25,7 @@
 import org.zstack.header.core.FutureReturnValueCompletion;
 import org.zstack.header.core.NoErrorCompletion;
 import org.zstack.header.core.NopeNoErrorCompletion;
+import org.zstack.header.core.cloudbus.CloudBusExtensionPoint;
 import org.zstack.header.errorcode.ErrorCode;
 import org.zstack.header.errorcode.OperationFailureException;
 import org.zstack.header.errorcode.SysErrors;
@@ -86,6 +87,7 @@ public class CloudBusImpl3 implements CloudBus, CloudBusIN {
     private List<Service> services = new ArrayList<>();
     private Map<Class, List<ReplyMessagePreSendingExtensionPoint>> replyMessageMarshaller = new ConcurrentHashMap<Class, List<ReplyMessagePreSendingExtensionPoint>>();
     private List<RestAPIExtensionPoint> apiExts = new ArrayList<>();
+    private List<CloudBusExtensionPoint> msgExts = new ArrayList<>();
 
     private Map<Class, List<BeforeDeliveryMessageInterceptor>> beforeDeliveryMessageInterceptors = new HashMap<Class, List<BeforeDeliveryMessageInterceptor>>();
     private Map<Class, List<BeforeSendMessageInterceptor>> beforeSendMessageInterceptors = new HashMap<Class, List<BeforeSendMessageInterceptor>>();
@@ -328,6 +330,7 @@ public void timeout() {
         };
 
         envelopes.put(msg.getId(), e);
+        msgExts.forEach(m -> m.afterAddEnvelopes(msg.getId()));
         send(msg, false);
     }
 
@@ -1056,6 +1059,7 @@ public void installBeforePublishEventInterceptor(BeforePublishEventInterceptor i
     private void populateExtension() {
         services = pluginRgty.getExtensionList(Service.class);
         apiExts = pluginRgty.getExtensionList(RestAPIExtensionPoint.class);
+        msgExts = pluginRgty.getExtensionList(CloudBusExtensionPoint.class);
         services.forEach(serv->{
             assert serv.getId() != null : String.format("service id can not be null[%s]", serv.getClass().getName());
             registerService(serv);
@@ -1201,4 +1205,9 @@ public void handleHttpRequest(HttpEntity<String> e, HttpServletResponse rsp) {
             logger.warn(String.format("unable to deliver a message received from HTTP. HTTP body: %s", e.getBody()), t);
         }
     }
+
+    @Override
+    public int getEnvelopeSize() {
+        return envelopes.size();
+    }
 }

header/src/main/java/org/zstack/header/core/cloudbus/CloudBusExtensionPoint.java

@@ -0,0 +1,8 @@
+package org.zstack.header.core.cloudbus;
+
+/**
+ * Created by mingjian.deng on 2020/3/31.
+ */
+public interface CloudBusExtensionPoint {
+    void afterAddEnvelopes(String id);
+}