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 bac06929f2 :zap: avoid use string.format (#12816)
bac06929f2 is described below

commit bac06929f21e42ba8fc574f3e829341432d571e2
Author: songxiaosheng <[email protected]>
AuthorDate: Wed Aug 9 16:05:04 2023 +0800

    :zap: avoid use string.format (#12816)
    
    * :zap: avoid use string.format
    
    * :zap: avoid use string.format
    
    * :zap: avoid use string.format
    
    ---------
    
    Co-authored-by: Albumen Kevin <[email protected]>
---
 .../apache/dubbo/metrics/model/key/MetricsKey.java | 175 +++++++++++----------
 .../dubbo/metrics/model/key/MetricsKeyWrapper.java |   2 +-
 .../metrics/collector/RegistryMetricsTest.java     |   7 +-
 3 files changed, 95 insertions(+), 89 deletions(-)

diff --git 
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
 
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
index 6b5329edc2..b7608a6d9f 100644
--- 
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
+++ 
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
@@ -17,131 +17,136 @@
 
 package org.apache.dubbo.metrics.model.key;
 
+/**
+ * Please follow a unified naming format as follows:
+ * dubbo_type_action_unit_otherfun
+ */
 public enum MetricsKey {
-    APPLICATION_METRIC_INFO("dubbo.application.info.total", "Total Application 
Info"),
+    APPLICATION_METRIC_INFO("application.info.total", "Total Application 
Info"),
 
-    CONFIGCENTER_METRIC_TOTAL("dubbo.configcenter.total", "Config Changed 
Total"),
+    CONFIGCENTER_METRIC_TOTAL("configcenter.total", "Config Changed Total"),
 
     // provider metrics key
-    METRIC_REQUESTS("dubbo.%s.requests.total", "Total Requests"),
-    METRIC_REQUESTS_SUCCEED("dubbo.%s.requests.succeed.total", "Total Succeed 
Requests"),
-    METRIC_REQUEST_BUSINESS_FAILED("dubbo.%s.requests.business.failed.total", 
"Total Failed Business Requests"),
-
-    METRIC_REQUESTS_PROCESSING("dubbo.%s.requests.processing.total", 
"Processing Requests"),
-    METRIC_REQUESTS_TIMEOUT("dubbo.%s.requests.timeout.total", "Total Timeout 
Failed Requests"),
-    METRIC_REQUESTS_LIMIT("dubbo.%s.requests.limit.total", "Total Limit Failed 
Requests"),
-    METRIC_REQUESTS_FAILED("dubbo.%s.requests.unknown.failed.total", "Total 
Unknown Failed Requests"),
-    METRIC_REQUESTS_TOTAL_FAILED("dubbo.%s.requests.failed.total", "Total 
Failed Requests"),
-    METRIC_REQUESTS_NETWORK_FAILED("dubbo.%s.requests.failed.network.total", 
"Total network Failed Requests"),
-    
METRIC_REQUESTS_SERVICE_UNAVAILABLE_FAILED("dubbo.%s.requests.failed.service.unavailable.total",
 "Total Service Unavailable Failed Requests"),
-    METRIC_REQUESTS_CODEC_FAILED("dubbo.%s.requests.failed.codec.total", 
"Total Codec Failed Requests"),
-
-    METRIC_REQUESTS_TOTAL_AGG("dubbo.%s.requests.total.aggregate", "Aggregated 
Total Requests"),
-    METRIC_REQUESTS_SUCCEED_AGG("dubbo.%s.requests.succeed.aggregate", 
"Aggregated Succeed Requests"),
-    METRIC_REQUESTS_FAILED_AGG("dubbo.%s.requests.failed.aggregate", 
"Aggregated Failed Requests"),
-    
METRIC_REQUEST_BUSINESS_FAILED_AGG("dubbo.%s.requests.business.failed.aggregate",
 "Aggregated Business Failed Requests"),
-    METRIC_REQUESTS_TIMEOUT_AGG("dubbo.%s.requests.timeout.failed.aggregate", 
"Aggregated timeout Failed Requests"),
-    METRIC_REQUESTS_LIMIT_AGG("dubbo.%s.requests.limit.aggregate", "Aggregated 
limit Requests"),
-    
METRIC_REQUESTS_TOTAL_FAILED_AGG("dubbo.%s.requests.failed.total.aggregate", 
"Aggregated failed total Requests"),
-    
METRIC_REQUESTS_NETWORK_FAILED_AGG("dubbo.%s.requests.failed.network.total.aggregate",
 "Aggregated failed network total Requests"),
-    
METRIC_REQUESTS_CODEC_FAILED_AGG("dubbo.%s.requests.failed.codec.total.aggregate",
 "Aggregated failed codec total Requests"),
-    
METRIC_REQUESTS_TOTAL_SERVICE_UNAVAILABLE_FAILED_AGG("dubbo.%s.requests.failed.service.unavailable.total.aggregate",
 "Aggregated failed codec total Requests"),
-
-    METRIC_QPS("dubbo.%s.qps.total", "Query Per Seconds"),
-    METRIC_RT_LAST("dubbo.%s.rt.milliseconds.last", "Last Response Time"),
-    METRIC_RT_MIN("dubbo.%s.rt.milliseconds.min", "Min Response Time"),
-    METRIC_RT_MAX("dubbo.%s.rt.milliseconds.max", "Max Response Time"),
-    METRIC_RT_SUM("dubbo.%s.rt.milliseconds.sum", "Sum Response Time"),
-    METRIC_RT_AVG("dubbo.%s.rt.milliseconds.avg", "Average Response Time"),
-    METRIC_RT_P99("dubbo.%s.rt.milliseconds.p99", "Response Time P99"),
-    METRIC_RT_P95("dubbo.%s.rt.milliseconds.p95", "Response Time P95"),
-    METRIC_RT_P90("dubbo.%s.rt.milliseconds.p90", "Response Time P90"),
-    METRIC_RT_P50("dubbo.%s.rt.milliseconds.p50", "Response Time P50"),
-    METRIC_RT_MIN_AGG("dubbo.%s.rt.min.milliseconds.aggregate", "Aggregated 
Min Response"),
-    METRIC_RT_MAX_AGG("dubbo.%s.rt.max.milliseconds.aggregate", "Aggregated 
Max Response"),
-    METRIC_RT_AVG_AGG("dubbo.%s.rt.avg.milliseconds.aggregate", "Aggregated 
Avg Response"),
+    METRIC_REQUESTS("requests.total", "Total Requests"),
+    METRIC_REQUESTS_SUCCEED("requests.succeed.total", "Total Succeed 
Requests"),
+    METRIC_REQUEST_BUSINESS_FAILED("requests.business.failed.total", "Total 
Failed Business Requests"),
+
+    METRIC_REQUESTS_PROCESSING("requests.processing.total", "Processing 
Requests"),
+    METRIC_REQUESTS_TIMEOUT("requests.timeout.total", "Total Timeout Failed 
Requests"),
+    METRIC_REQUESTS_LIMIT("requests.limit.total", "Total Limit Failed 
Requests"),
+    METRIC_REQUESTS_FAILED("requests.unknown.failed.total", "Total Unknown 
Failed Requests"),
+    METRIC_REQUESTS_TOTAL_FAILED("requests.failed.total", "Total Failed 
Requests"),
+    METRIC_REQUESTS_NETWORK_FAILED("requests.failed.network.total", "Total 
network Failed Requests"),
+    
METRIC_REQUESTS_SERVICE_UNAVAILABLE_FAILED("requests.failed.service.unavailable.total",
 "Total Service Unavailable Failed Requests"),
+    METRIC_REQUESTS_CODEC_FAILED("requests.failed.codec.total", "Total Codec 
Failed Requests"),
+
+    METRIC_REQUESTS_TOTAL_AGG("requests.total.aggregate", "Aggregated Total 
Requests"),
+    METRIC_REQUESTS_SUCCEED_AGG("requests.succeed.aggregate", "Aggregated 
Succeed Requests"),
+    METRIC_REQUESTS_FAILED_AGG("requests.failed.aggregate", "Aggregated Failed 
Requests"),
+    METRIC_REQUEST_BUSINESS_FAILED_AGG("requests.business.failed.aggregate", 
"Aggregated Business Failed Requests"),
+    METRIC_REQUESTS_TIMEOUT_AGG("requests.timeout.failed.aggregate", 
"Aggregated timeout Failed Requests"),
+    METRIC_REQUESTS_LIMIT_AGG("requests.limit.aggregate", "Aggregated limit 
Requests"),
+    METRIC_REQUESTS_TOTAL_FAILED_AGG("requests.failed.total.aggregate", 
"Aggregated failed total Requests"),
+    
METRIC_REQUESTS_NETWORK_FAILED_AGG("requests.failed.network.total.aggregate", 
"Aggregated failed network total Requests"),
+    METRIC_REQUESTS_CODEC_FAILED_AGG("requests.failed.codec.total.aggregate", 
"Aggregated failed codec total Requests"),
+    
METRIC_REQUESTS_TOTAL_SERVICE_UNAVAILABLE_FAILED_AGG("requests.failed.service.unavailable.total.aggregate",
 "Aggregated failed codec total Requests"),
+
+    METRIC_QPS("qps.total", "Query Per Seconds"),
+    METRIC_RT_LAST("rt.milliseconds.last", "Last Response Time"),
+    METRIC_RT_MIN("rt.milliseconds.min", "Min Response Time"),
+    METRIC_RT_MAX("rt.milliseconds.max", "Max Response Time"),
+    METRIC_RT_SUM("rt.milliseconds.sum", "Sum Response Time"),
+    METRIC_RT_AVG("rt.milliseconds.avg", "Average Response Time"),
+    METRIC_RT_P99("rt.milliseconds.p99", "Response Time P99"),
+    METRIC_RT_P95("rt.milliseconds.p95", "Response Time P95"),
+    METRIC_RT_P90("rt.milliseconds.p90", "Response Time P90"),
+    METRIC_RT_P50("rt.milliseconds.p50", "Response Time P50"),
+    METRIC_RT_MIN_AGG("rt.milliseconds.min.aggregate", "Aggregated Min 
Response"),
+    METRIC_RT_MAX_AGG("rt.milliseconds.max.aggregate", "Aggregated Max 
Response"),
+    METRIC_RT_AVG_AGG("rt.milliseconds.avg.aggregate", "Aggregated Avg 
Response"),
 
     // register metrics key
-    REGISTER_METRIC_REQUESTS("dubbo.registry.register.requests.total", "Total 
Register Requests"),
-    
REGISTER_METRIC_REQUESTS_SUCCEED("dubbo.registry.register.requests.succeed.total",
 "Succeed Register Requests"),
-    
REGISTER_METRIC_REQUESTS_FAILED("dubbo.registry.register.requests.failed.total",
 "Failed Register Requests"),
-    METRIC_RT_HISTOGRAM("dubbo.%s.rt.milliseconds.histogram", "Response Time 
Histogram"),
+    REGISTER_METRIC_REQUESTS("registry.register.requests.total", "Total 
Register Requests"),
+    
REGISTER_METRIC_REQUESTS_SUCCEED("registry.register.requests.succeed.total", 
"Succeed Register Requests"),
+    REGISTER_METRIC_REQUESTS_FAILED("registry.register.requests.failed.total", 
"Failed Register Requests"),
+    METRIC_RT_HISTOGRAM("rt.milliseconds.histogram", "Response Time 
Histogram"),
 
 
-    GENERIC_METRIC_REQUESTS("dubbo.%s.requests.total", "Total %s Requests"),
-    GENERIC_METRIC_REQUESTS_SUCCEED("dubbo.%s.requests.succeed.total", 
"Succeed %s Requests"),
-    GENERIC_METRIC_REQUESTS_FAILED("dubbo.%s.requests.failed.total", "Failed 
%s Requests"),
+    GENERIC_METRIC_REQUESTS("requests.total", "Total %s Requests"),
+    GENERIC_METRIC_REQUESTS_SUCCEED("requests.succeed.total", "Succeed %s 
Requests"),
+    GENERIC_METRIC_REQUESTS_FAILED("requests.failed.total", "Failed %s 
Requests"),
 
     // subscribe metrics key
-    SUBSCRIBE_METRIC_NUM("dubbo.registry.subscribe.num.total", "Total 
Subscribe Num"),
-    SUBSCRIBE_METRIC_NUM_SUCCEED("dubbo.registry.subscribe.num.succeed.total", 
"Succeed Subscribe Num"),
-    SUBSCRIBE_METRIC_NUM_FAILED("dubbo.registry.subscribe.num.failed.total", 
"Failed Subscribe Num"),
+    SUBSCRIBE_METRIC_NUM("registry.subscribe.num.total", "Total Subscribe 
Num"),
+    SUBSCRIBE_METRIC_NUM_SUCCEED("registry.subscribe.num.succeed.total", 
"Succeed Subscribe Num"),
+    SUBSCRIBE_METRIC_NUM_FAILED("registry.subscribe.num.failed.total", "Failed 
Subscribe Num"),
 
     // directory metrics key
-    DIRECTORY_METRIC_NUM_ALL("dubbo.registry.directory.num.all", "All 
Directory Urls"),
-    DIRECTORY_METRIC_NUM_VALID("dubbo.registry.directory.num.valid.total", 
"Valid Directory Urls"),
-    
DIRECTORY_METRIC_NUM_TO_RECONNECT("dubbo.registry.directory.num.to_reconnect.total",
 "ToReconnect Directory Urls"),
-    DIRECTORY_METRIC_NUM_DISABLE("dubbo.registry.directory.num.disable.total", 
"Disable Directory Urls"),
-
-    NOTIFY_METRIC_REQUESTS("dubbo.registry.notify.requests.total", "Total 
Notify Requests"),
-    NOTIFY_METRIC_NUM_LAST("dubbo.registry.notify.num.last", "Last Notify 
Nums"),
-
-    THREAD_POOL_CORE_SIZE("dubbo.thread.pool.core.size", "Thread Pool Core 
Size"),
-    THREAD_POOL_LARGEST_SIZE("dubbo.thread.pool.largest.size", "Thread Pool 
Largest Size"),
-    THREAD_POOL_MAX_SIZE("dubbo.thread.pool.max.size", "Thread Pool Max Size"),
-    THREAD_POOL_ACTIVE_SIZE("dubbo.thread.pool.active.size", "Thread Pool 
Active Size"),
-    THREAD_POOL_THREAD_COUNT("dubbo.thread.pool.thread.count", "Thread Pool 
Thread Count"),
-    THREAD_POOL_QUEUE_SIZE("dubbo.thread.pool.queue.size", "Thread Pool Queue 
Size"),
-    THREAD_POOL_THREAD_REJECT_COUNT("dubbo.thread.pool.reject.thread.count", 
"Thread Pool Reject Thread Count"),
+    DIRECTORY_METRIC_NUM_ALL("registry.directory.num.all", "All Directory 
Urls"),
+    DIRECTORY_METRIC_NUM_VALID("registry.directory.num.valid.total", "Valid 
Directory Urls"),
+    
DIRECTORY_METRIC_NUM_TO_RECONNECT("registry.directory.num.to_reconnect.total", 
"ToReconnect Directory Urls"),
+    DIRECTORY_METRIC_NUM_DISABLE("registry.directory.num.disable.total", 
"Disable Directory Urls"),
+
+    NOTIFY_METRIC_REQUESTS("registry.notify.requests.total", "Total Notify 
Requests"),
+    NOTIFY_METRIC_NUM_LAST("registry.notify.num.last", "Last Notify Nums"),
+
+    THREAD_POOL_CORE_SIZE("thread.pool.core.size", "Thread Pool Core Size"),
+    THREAD_POOL_LARGEST_SIZE("thread.pool.largest.size", "Thread Pool Largest 
Size"),
+    THREAD_POOL_MAX_SIZE("thread.pool.max.size", "Thread Pool Max Size"),
+    THREAD_POOL_ACTIVE_SIZE("thread.pool.active.size", "Thread Pool Active 
Size"),
+    THREAD_POOL_THREAD_COUNT("thread.pool.thread.count", "Thread Pool Thread 
Count"),
+    THREAD_POOL_QUEUE_SIZE("thread.pool.queue.size", "Thread Pool Queue Size"),
+    THREAD_POOL_THREAD_REJECT_COUNT("thread.pool.reject.thread.count", "Thread 
Pool Reject Thread Count"),
 
     // metadata push metrics key
-    METADATA_PUSH_METRIC_NUM("dubbo.metadata.push.num.total", "Total Push 
Num"),
-    METADATA_PUSH_METRIC_NUM_SUCCEED("dubbo.metadata.push.num.succeed.total", 
"Succeed Push Num"),
-    METADATA_PUSH_METRIC_NUM_FAILED("dubbo.metadata.push.num.failed.total", 
"Failed Push Num"),
+    METADATA_PUSH_METRIC_NUM("metadata.push.num.total", "Total Push Num"),
+    METADATA_PUSH_METRIC_NUM_SUCCEED("metadata.push.num.succeed.total", 
"Succeed Push Num"),
+    METADATA_PUSH_METRIC_NUM_FAILED("metadata.push.num.failed.total", "Failed 
Push Num"),
 
     // metadata subscribe metrics key
-    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_SUBSCRIBE_METRIC_NUM("metadata.subscribe.num.total", "Total 
Metadata Subscribe Num"),
+    
METADATA_SUBSCRIBE_METRIC_NUM_SUCCEED("metadata.subscribe.num.succeed.total", 
"Succeed Metadata Subscribe Num"),
+    
METADATA_SUBSCRIBE_METRIC_NUM_FAILED("metadata.subscribe.num.failed.total", 
"Failed Metadata Subscribe Num"),
 
     // register service metrics key
-    SERVICE_REGISTER_METRIC_REQUESTS("dubbo.registry.register.service.total", 
"Total Service-Level Register Requests"),
-    
SERVICE_REGISTER_METRIC_REQUESTS_SUCCEED("dubbo.registry.register.service.succeed.total",
 "Succeed Service-Level Register Requests"),
-    
SERVICE_REGISTER_METRIC_REQUESTS_FAILED("dubbo.registry.register.service.failed.total",
 "Failed Service-Level Register Requests"),
+    SERVICE_REGISTER_METRIC_REQUESTS("registry.total", "Total Service-Level 
Register Requests"),
+    SERVICE_REGISTER_METRIC_REQUESTS_SUCCEED("registry.succeed.total", 
"Succeed Service-Level Register Requests"),
+    SERVICE_REGISTER_METRIC_REQUESTS_FAILED("registry.failed.total", "Failed 
Service-Level Register Requests"),
 
     // subscribe metrics key
-    SERVICE_SUBSCRIBE_METRIC_NUM("dubbo.registry.subscribe.service.num.total", 
"Total Service-Level Subscribe Num"),
-    
SERVICE_SUBSCRIBE_METRIC_NUM_SUCCEED("dubbo.registry.subscribe.service.num.succeed.total",
 "Succeed Service-Level Num"),
-    
SERVICE_SUBSCRIBE_METRIC_NUM_FAILED("dubbo.registry.subscribe.service.num.failed.total",
 "Failed Service-Level Num"),
+    SERVICE_SUBSCRIBE_METRIC_NUM("registry.subscribe.service.num.total", 
"Total Service-Level Subscribe Num"),
+    
SERVICE_SUBSCRIBE_METRIC_NUM_SUCCEED("registry.subscribe.service.num.succeed.total",
 "Succeed Service-Level Num"),
+    
SERVICE_SUBSCRIBE_METRIC_NUM_FAILED("registry.subscribe.service.num.failed.total",
 "Failed Service-Level Num"),
     // store provider metadata service key
-    STORE_PROVIDER_METADATA("dubbo.metadata.store.provider.total", "Store 
Provider Metadata"),
+    STORE_PROVIDER_METADATA("metadata.store.provider.total", "Store Provider 
Metadata"),
 
-    
STORE_PROVIDER_METADATA_SUCCEED("dubbo.metadata.store.provider.succeed.total", 
"Succeed Store Provider Metadata"),
+    STORE_PROVIDER_METADATA_SUCCEED("metadata.store.provider.succeed.total", 
"Succeed Store Provider Metadata"),
 
-    
STORE_PROVIDER_METADATA_FAILED("dubbo.metadata.store.provider.failed.total", 
"Failed Store Provider Metadata"),
+    STORE_PROVIDER_METADATA_FAILED("metadata.store.provider.failed.total", 
"Failed Store Provider Metadata"),
     METADATA_GIT_COMMITID_METRIC("git.commit.id", "Git Commit Id Metrics"),
 
     // consumer metrics key
-    INVOKER_NO_AVAILABLE_COUNT("dubbo.consumer.invoker.no.available.count", 
"Request Throw No Invoker Available Exception Count"),
+    INVOKER_NO_AVAILABLE_COUNT("consumer.invoker.no.available.count", "Request 
Throw No Invoker Available Exception Count"),
     ;
 
-    private String name;
+    private String nameSuffix;
     private String description;
 
     public final String getName() {
-        return this.name;
+        return "dubbo." + nameSuffix;
     }
 
     public final String getNameByType(String type) {
-        return String.format(name, type);
+        return "dubbo." + type + "." + nameSuffix;
     }
 
     public final String getDescription() {
         return this.description;
     }
 
-    MetricsKey(String name, String description) {
-        this.name = name;
+
+    MetricsKey(String nameSuffix, String description) {
+        this.nameSuffix = nameSuffix;
         this.description = description;
     }
 }
diff --git 
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKeyWrapper.java
 
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKeyWrapper.java
index 095cc5f305..042bfd0e3c 100644
--- 
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKeyWrapper.java
+++ 
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKeyWrapper.java
@@ -85,7 +85,7 @@ public class MetricsKeyWrapper {
             return metricsKey.getName();
         }
         try {
-            return String.format(metricsKey.getName(), getType());
+            return metricsKey.getNameByType(getType());
         } catch (Exception ignore) {
             return metricsKey.getName();
         }
diff --git 
a/dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsTest.java
 
b/dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsTest.java
index 5610bef232..3187161fad 100644
--- 
a/dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsTest.java
+++ 
b/dubbo-metrics/dubbo-metrics-registry/src/test/java/org/apache/dubbo/metrics/registry/metrics/collector/RegistryMetricsTest.java
@@ -25,6 +25,7 @@ import org.apache.dubbo.config.nested.AggregationConfig;
 import org.apache.dubbo.metrics.model.key.MetricsKey;
 import org.apache.dubbo.metrics.model.sample.GaugeMetricSample;
 import org.apache.dubbo.metrics.model.sample.MetricSample;
+import org.apache.dubbo.metrics.registry.RegistryMetricsConstants;
 import org.apache.dubbo.metrics.registry.collector.RegistryMetricsCollector;
 import org.apache.dubbo.metrics.registry.event.RegistryEvent;
 import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -221,9 +222,9 @@ public class RegistryMetricsTest {
         }
         List<MetricSample> samples = collector.collect();
 
-        GaugeMetricSample<?> succeedRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS_SUCCEED.getName(), 
samples);
-        GaugeMetricSample<?> failedRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS_FAILED.getName(), 
samples);
-        GaugeMetricSample<?> totalRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS.getName(), samples);
+        GaugeMetricSample<?> succeedRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS_SUCCEED.getNameByType(RegistryMetricsConstants.OP_TYPE_REGISTER_SERVICE.getType()),
 samples);
+        GaugeMetricSample<?> failedRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS_FAILED.getNameByType(RegistryMetricsConstants.OP_TYPE_REGISTER_SERVICE.getType()),
 samples);
+        GaugeMetricSample<?> totalRequests = 
getSample(MetricsKey.SERVICE_REGISTER_METRIC_REQUESTS.getNameByType(RegistryMetricsConstants.OP_TYPE_REGISTER_SERVICE.getType()),
 samples);
 
         Assertions.assertEquals(5L, succeedRequests.applyAsLong());
         Assertions.assertEquals(5L, failedRequests.applyAsLong());

Reply via email to