Optimization dubbo meter pull delay and add dubbo version meter

dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetricsConstants.java

@@ -34,6 +34,8 @@ public interface MetricsConstants {
 
     String TAG_VERSION_KEY = "version";
 
+    String TAG_APPLICATION_VERSION_KEY = "application.version";
+
     String ENABLE_JVM_METRICS_KEY = "enable.jvm.metrics";
 
     String AGGREGATION_COLLECTOR_KEY = "aggregation";

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java

@@ -17,6 +17,7 @@
 package org.apache.dubbo.config.deploy;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.Version;
 import org.apache.dubbo.common.config.ConfigurationUtils;
 import org.apache.dubbo.common.config.Environment;
 import org.apache.dubbo.common.config.ReferenceCache;
@@ -364,6 +365,7 @@ private void initMetricsReporter() {
         // TODO compatible with old usage of metrics, remove protocol check after new metrics is ready for use.
         if (metricsConfig != null && PROTOCOL_PROMETHEUS.equals(metricsConfig.getProtocol())) {
             collector.setCollectEnabled(true);
+            collector.addApplicationInfo(applicationModel.getApplicationName(), Version.getVersion());
             String protocol = metricsConfig.getProtocol();
             if (StringUtils.isNotEmpty(protocol)) {
                 MetricsReporterFactory metricsReporterFactory = getExtensionLoader(MetricsReporterFactory.class).getAdaptiveExtension();

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/stat/MetricsStatHandler.java

@@ -30,4 +30,7 @@ public interface MetricsStatHandler {
     MetricsEvent increase(String applicationName, Invocation invocation);
 
     MetricsEvent decrease(String applicationName, Invocation invocation);
+
+    MetricsEvent addApplication(String applicationName, String version);
+
 }

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/ApplicationEvent.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.metrics.event;
+
+public class ApplicationEvent extends MetricsEvent{
+    private ApplicationEvent.Type type;
+
+    public ApplicationEvent(Object source, ApplicationEvent.Type type) {
+        super(source);
+        this.type = type;
+    }
+
+    public ApplicationEvent.Type getType() {
+        return type;
+    }
+
+    public void setType(ApplicationEvent.Type type) {
+        this.type = type;
+    }
+
+}

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/MetricsEvent.java

@@ -44,4 +44,16 @@ public Object getSource() {
     public String toString() {
         return getClass().getName() + "[source=" + source + "]";
     }
+
+    public enum Type {
+        TOTAL,
+        SUCCEED,
+        BUSINESS_FAILED,
+        REQUEST_TIMEOUT,
+        REQUEST_LIMIT,
+        PROCESSING,
+        UNKNOWN_FAILED,
+        TOTAL_FAILED,
+        APPLICATION_INFO
+    }
 }

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/RequestEvent.java

@@ -36,14 +36,5 @@ public void setType(Type type) {
         this.type = type;
     }
 
-    public enum Type {
-        TOTAL,
-        SUCCEED,
-        BUSINESS_FAILED,
-        REQUEST_TIMEOUT,
-        REQUEST_LIMIT,
-        PROCESSING,
-        UNKNOWN_FAILED,
-        TOTAL_FAILED
-    }
+
 }

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java

@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.metrics.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_HOSTNAME;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_VERSION_KEY;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_NAME;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_IP;
+import static org.apache.dubbo.common.utils.NetUtils.getLocalHost;
+import static org.apache.dubbo.common.utils.NetUtils.getLocalHostName;
+
+public class ApplicationMetric implements Metric {
+    private String applicationName;
+    private String version;
+
+    public ApplicationMetric(String applicationName, String version) {
+        this.applicationName = applicationName;
+        this.version = version;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+
+    public String getData() {
+        return version;
+    }
+
+    public void setData(String version) {
+        this.version = version;
+    }
+
+    @Override
+    public Map<String, String> getTags() {
+        Map<String, String> tags = new HashMap<>();
+        tags.put(TAG_IP, getLocalHost());
+        tags.put(TAG_HOSTNAME, getLocalHostName());
+        tags.put(TAG_APPLICATION_NAME, applicationName);
+
+        tags.put(TAG_APPLICATION_VERSION_KEY, version);
+        return tags;
+    }
+}

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MethodMetric.java

@@ -38,7 +38,7 @@
 /**
  * Metric class for method.
  */
-public class MethodMetric {
+public class MethodMetric implements Metric {
     private String applicationName;
     private String interfaceName;
     private String methodName;

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/Metric.java

@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.metrics.model;
+
+import java.util.Map;
+
+public interface Metric {
+    Map<String, String> getTags();
+}

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsCategory.java

@@ -24,4 +24,5 @@ public enum MetricsCategory {
     RT,
     QPS,
     REQUESTS,
+    APPLICATION
 }

dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java

@@ -18,6 +18,7 @@
 package org.apache.dubbo.metrics.model;
 
 public enum MetricsKey {
+    APPLICATION_METRIC_INFO("dubbo.application.info.total", "Total Application Info"),
 
     // provider metrics key
     PROVIDER_METRIC_REQUESTS("dubbo.provider.requests.total", "Total Requests"),

dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java

@@ -101,7 +101,7 @@ private void onRTEvent(RTEvent event) {
 
     private void onRequestEvent(RequestEvent event) {
         MethodMetric metric = (MethodMetric) event.getSource();
-        RequestEvent.Type type = event.getType();
+        MetricsEvent.Type type = event.getType();
         TimeWindowCounter counter = null;
         switch (type) {
             case TOTAL:

dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/DefaultMetricsCollector.java

@@ -21,7 +21,6 @@
 import org.apache.dubbo.metrics.collector.stat.MetricsStatHandler;
 import org.apache.dubbo.metrics.event.EmptyEvent;
 import org.apache.dubbo.metrics.event.MetricsEvent;
-import org.apache.dubbo.metrics.event.RequestEvent;
 import org.apache.dubbo.metrics.event.SimpleMetricsEventMulticaster;
 import org.apache.dubbo.metrics.listener.MetricsListener;
 import org.apache.dubbo.metrics.model.MetricsKey;
@@ -36,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
+import static org.apache.dubbo.metrics.model.MetricsCategory.APPLICATION;
 import static org.apache.dubbo.metrics.model.MetricsCategory.REQUESTS;
 import static org.apache.dubbo.metrics.model.MetricsCategory.RT;
 
@@ -63,85 +63,96 @@ public Boolean isCollectEnabled() {
     }
 
     public void increaseTotalRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName, RequestEvent.Type.TOTAL, invocation);
+        increaseAndPublishEvent(applicationName, MetricsEvent.Type.TOTAL, invocation);
     }
 
     public void increaseSucceedRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName, RequestEvent.Type.SUCCEED, invocation);
+        increaseAndPublishEvent(applicationName, MetricsEvent.Type.SUCCEED, invocation);
     }
 
     public void increaseUnknownFailedRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName, RequestEvent.Type.UNKNOWN_FAILED, invocation);
+        increaseAndPublishEvent(applicationName, MetricsEvent.Type.UNKNOWN_FAILED, invocation);
     }
 
     public void businessFailedRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName, RequestEvent.Type.BUSINESS_FAILED, invocation);
+        increaseAndPublishEvent(applicationName, MetricsEvent.Type.BUSINESS_FAILED, invocation);
     }
 
     public void timeoutRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName,RequestEvent.Type.REQUEST_TIMEOUT, invocation);
+        increaseAndPublishEvent(applicationName,MetricsEvent.Type.REQUEST_TIMEOUT, invocation);
     }
 
     public void limitRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName,RequestEvent.Type.REQUEST_LIMIT, invocation);
+        increaseAndPublishEvent(applicationName,MetricsEvent.Type.REQUEST_LIMIT, invocation);
     }
 
     public void increaseProcessingRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName,RequestEvent.Type.PROCESSING, invocation);
+        increaseAndPublishEvent(applicationName,MetricsEvent.Type.PROCESSING, invocation);
     }
 
     public void decreaseProcessingRequests(String applicationName, Invocation invocation) {
-        decreaseAndPublishEvent(applicationName,RequestEvent.Type.PROCESSING, invocation);
+        decreaseAndPublishEvent(applicationName,MetricsEvent.Type.PROCESSING, invocation);
     }
 
     public void totalFailedRequests(String applicationName, Invocation invocation) {
-        increaseAndPublishEvent(applicationName,RequestEvent.Type.TOTAL_FAILED, invocation);
+        increaseAndPublishEvent(applicationName,MetricsEvent.Type.TOTAL_FAILED, invocation);
     }
 
-    private void increaseAndPublishEvent(String applicationName, RequestEvent.Type total, Invocation invocation) {
+    private void increaseAndPublishEvent(String applicationName, MetricsEvent.Type total, Invocation invocation) {
         this.eventMulticaster.publishEvent(doExecute(total, statHandler -> statHandler.increase(applicationName,invocation)));
     }
 
-    private void decreaseAndPublishEvent(String applicationName, RequestEvent.Type total, Invocation invocation) {
-        this.eventMulticaster.publishEvent(doExecute(total, statHandler -> statHandler.decrease(applicationName,invocation)));
+    private void decreaseAndPublishEvent(String applicationName, MetricsEvent.Type type, Invocation invocation) {
+        this.eventMulticaster.publishEvent(doExecute(type, statHandler -> statHandler.decrease(applicationName,invocation)));
     }
 
     public void addRT(String applicationName,Invocation invocation, Long responseTime) {
         this.eventMulticaster.publishEvent(stats.addRtAndRetrieveEvent(applicationName,invocation, responseTime));
     }
-
+    public void addApplicationInfo(String applicationName, String version) {
+        doExecute(MetricsEvent.Type.APPLICATION_INFO, statHandler -> statHandler.addApplication(applicationName,version));
+    }
     @Override
     public List<MetricSample> collect() {
         List<MetricSample> list = new ArrayList<>();
+        collectApplication(list);
         collectRequests(list);
         collectRT(list);
 
         return list;
     }
 
+    private void collectApplication(List<MetricSample> list) {
+        doCollect(MetricsEvent.Type.APPLICATION_INFO, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+            .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.APPLICATION_METRIC_INFO, k.getTags(),
+                APPLICATION, v::get))));
+
+
+    }
+
     private void collectRequests(List<MetricSample> list) {
-        doCollect(RequestEvent.Type.TOTAL, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.TOTAL, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.SUCCEED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.SUCCEED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.UNKNOWN_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.UNKNOWN_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.PROCESSING, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.PROCESSING, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_PROCESSING, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.BUSINESS_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.BUSINESS_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUEST_BUSINESS_FAILED, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.REQUEST_TIMEOUT, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.REQUEST_TIMEOUT, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.REQUEST_LIMIT, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.REQUEST_LIMIT, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT, k.getTags(), REQUESTS, v::get))));
 
-        doCollect(RequestEvent.Type.TOTAL_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
+        doCollect(MetricsEvent.Type.TOTAL_FAILED, MetricsStatHandler::get).filter(e -> !e.isEmpty())
             .ifPresent(map -> map.forEach((k, v) -> list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED, k.getTags(), REQUESTS, v::get))));
 
     }
@@ -162,19 +173,19 @@ private void collectRT(List<MetricSample> list) {
     }
 
     private <
-        T> Optional<T> doCollect(RequestEvent.Type requestType, Function<MetricsStatHandler, T> statExecutor) {
+        T> Optional<T> doCollect(MetricsEvent.Type metricsEventType, Function<MetricsStatHandler, T> statExecutor) {
         if (isCollectEnabled()) {
-            MetricsStatHandler handler = stats.getHandler(requestType);
+            MetricsStatHandler handler = stats.getHandler(metricsEventType);
             T result = statExecutor.apply(handler);
             return Optional.ofNullable(result);
         }
         return Optional.empty();
     }
 
-    private MetricsEvent doExecute(RequestEvent.Type
-                                       requestType, Function<MetricsStatHandler, MetricsEvent> statExecutor) {
+    private MetricsEvent doExecute(MetricsEvent.Type  metricsEventType,
+                                   Function<MetricsStatHandler, MetricsEvent> statExecutor) {
         if (isCollectEnabled()) {
-            MetricsStatHandler handler = stats.getHandler(requestType);
+            MetricsStatHandler handler = stats.getHandler(metricsEventType);
             return statExecutor.apply(handler);
         }
         return EmptyEvent.instance();