[dubbo] branch 3.2 updated: add commit id metrics (#11843)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new a9bff0d6e9 add commit id metrics (#11843)
a9bff0d6e9 is described below

commit a9bff0d6e951c3ebcbcb8e14fb3efcc2d59f1ba7
Author: xiaohuashengpeanut <12...@users.noreply.github.com>
AuthorDate: Thu Mar 16 09:43:02 2023 +0800

    add commit id metrics (#11843)
    
    * add commit id metrics
    
    * reslove * problem
    
    ---------
    
    Co-authored-by: PEANUT <a1...@qq.com>
---
 .../main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java | 6 ++++--
 .../src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java
index ff23c7d8b0..b0e583806f 100644
--- a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java
+++ b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/ApplicationMetric.java
@@ -22,16 +22,17 @@ import org.apache.dubbo.common.Version;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_NAME;
-import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_VERSION_KEY;
 import static org.apache.dubbo.common.constants.MetricsConstants.TAG_HOSTNAME;
 import static org.apache.dubbo.common.constants.MetricsConstants.TAG_IP;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_NAME;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_APPLICATION_VERSION_KEY;
 import static org.apache.dubbo.common.utils.NetUtils.getLocalHost;
 import static org.apache.dubbo.common.utils.NetUtils.getLocalHostName;
 
 public class ApplicationMetric implements Metric {
     private final String applicationName;
     private static final String version = Version.getVersion();
+    private static final String commitId = Version.getLastCommitId();
 
     public ApplicationMetric(String applicationName) {
         this.applicationName = applicationName;
@@ -56,6 +57,7 @@ public class ApplicationMetric implements Metric {
         tags.put(TAG_HOSTNAME, getLocalHostName());
         tags.put(TAG_APPLICATION_NAME, applicationName);
         tags.put(TAG_APPLICATION_VERSION_KEY, version);
+        tags.put(MetricsKey.METADATA_GIT_COMMITID_METRIC.getName(), commitId);
         return tags;
     }
 }
diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java
index 86b2c873c9..8fe6d1a96e 100644
--- a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java
+++ b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/MetricsKey.java
@@ -91,7 +91,7 @@ public enum MetricsKey {
     METADATA_SUBSCRIBE_METRIC_NUM("dubbo.metadata.subscribe.num.total", "Total Metadata Subscribe Num"),
     METADATA_SUBSCRIBE_METRIC_NUM_SUCCEED("dubbo.metadata.subscribe.num.succeed.total", "Succeed Metadata Subscribe Num"),
     METADATA_SUBSCRIBE_METRIC_NUM_FAILED("dubbo.metadata.subscribe.num.failed.total", "Failed Metadata Subscribe Num"),
-
+    METADATA_GIT_COMMITID_METRIC("git.commit.id","Git Commit Id Metrics");
     // consumer metrics key
     ;