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 af1825e72b Add dubbo prefix(dubbo.provider) to dubbo's provider.
(#11295)
af1825e72b is described below
commit af1825e72b45352d3d8eb460773b6a204463ee74
Author: fomeiherz <[email protected]>
AuthorDate: Mon Jan 16 14:16:48 2023 +0800
Add dubbo prefix(dubbo.provider) to dubbo's provider. (#11295)
---
.../metrics/collector/DefaultMetricsCollector.java | 24 ++++++------
.../dubbo/common/metrics/model/MetricsKey.java | 45 ++++++++++++----------
.../collector/DefaultMetricsCollectorTest.java | 15 ++++----
.../collector/AggregateMetricsCollector.java | 18 ++++-----
.../collector/AggregateMetricsCollectorTest.java | 14 +++----
.../dubbo/metrics/filter/MetricsFilterTest.java | 34 ++++++++--------
6 files changed, 77 insertions(+), 73 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollector.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollector.java
index 1760ccb59f..3aeb48509b 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollector.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollector.java
@@ -134,39 +134,39 @@ public class DefaultMetricsCollector implements
MetricsCollector {
private void collectRequests(List<MetricSample> list) {
doExecute(RequestEvent.Type.TOTAL,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_TOTAL, k.getTags(), REQUESTS,
v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.Type.SUCCEED,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_SUCCEED, k.getTags(), REQUESTS,
v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.Type.FAILED,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_FAILED, k.getTags(), REQUESTS,
v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.Type.PROCESSING,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_PROCESSING, k.getTags(), REQUESTS,
v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_PROCESSING, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.Type.BUSINESS_FAILED,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUEST_BUSINESS_FAILED, k.getTags(),
REQUESTS, v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUEST_BUSINESS_FAILED,
k.getTags(), REQUESTS, v::get))));
doExecute(RequestEvent.Type.REQUEST_TIMEOUT,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_TIMEOUT_AGG, k.getTags(),
REQUESTS, v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.Type.REQUEST_LIMIT,
MetricsStatHandler::get).filter(e->!e.isEmpty())
- .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_LIMIT_AGG, k.getTags(), REQUESTS,
v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG, k.getTags(),
REQUESTS, v::get))));
}
private void collectRT(List<MetricSample> list) {
- this.stats.getLastRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_RT_LAST, k.getTags(), RT, v::get)));
- this.stats.getMinRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_RT_MIN, k.getTags(), RT, v::get)));
- this.stats.getMaxRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_RT_MAX, k.getTags(), RT, v::get)));
+ this.stats.getLastRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_LAST, k.getTags(), RT,
v::get)));
+ this.stats.getMinRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_MIN, k.getTags(), RT, v::get)));
+ this.stats.getMaxRT().forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_MAX, k.getTags(), RT, v::get)));
this.stats.getTotalRT().forEach((k, v) -> {
- list.add(new GaugeMetricSample(MetricsKey.METRIC_RT_TOTAL,
k.getTags(), RT, v::get));
+ list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_TOTAL, k.getTags(), RT,
v::get));
AtomicLong avg = this.stats.getAvgRT().get(k);
AtomicLong count = this.stats.getRtCount().get(k);
avg.set(v.get() / count.get());
- list.add(new GaugeMetricSample(MetricsKey.METRIC_RT_AVG,
k.getTags(), RT, avg::get));
+ list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_AVG,
k.getTags(), RT, avg::get));
});
}
private <T> Optional<T> doExecute(RequestEvent.Type requestType,
Function<MetricsStatHandler,T> statExecutor) {
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/model/MetricsKey.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/model/MetricsKey.java
index c3ec5f31d1..b352a187fc 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/model/MetricsKey.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/model/MetricsKey.java
@@ -19,27 +19,30 @@ package org.apache.dubbo.common.metrics.model;
public enum MetricsKey {
- METRIC_REQUESTS_TOTAL("requests.total", "Total Requests"),
- METRIC_REQUESTS_SUCCEED("requests.succeed", "Succeed Requests"),
- METRIC_REQUESTS_FAILED("requests.failed", "Failed Requests"),
- METRIC_REQUEST_BUSINESS_FAILED("requests.business.failed","Failed Business
Requests"),
- METRIC_REQUESTS_PROCESSING("requests.processing", "Processing 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_REQUESTS_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_QPS("qps", "Query Per Seconds"),
- METRIC_RT_LAST("rt.last", "Last Response Time"),
- METRIC_RT_MIN("rt.min", "Min Response Time"),
- METRIC_RT_MAX("rt.max", "Max Response Time"),
- METRIC_RT_TOTAL("rt.total", "Total Response Time"),
- METRIC_RT_AVG("rt.avg", "Average Response Time"),
- METRIC_RT_P99("rt.p99", "Response Time P99"),
- METRIC_RT_P95("rt.p95", "Response Time P95"),
+ // provider metrics key
+ PROVIDER_METRIC_REQUESTS_TOTAL("dubbo.provider.requests.total", "Total
Requests"),
+ PROVIDER_METRIC_REQUESTS_SUCCEED("dubbo.provider.requests.succeed",
"Succeed Requests"),
+ PROVIDER_METRIC_REQUESTS_FAILED("dubbo.provider.requests.failed", "Failed
Requests"),
+
PROVIDER_METRIC_REQUEST_BUSINESS_FAILED("dubbo.provider.requests.business.failed","Failed
Business Requests"),
+ PROVIDER_METRIC_REQUESTS_PROCESSING("dubbo.provider.requests.processing",
"Processing Requests"),
+
+
PROVIDER_METRIC_REQUESTS_TOTAL_AGG("dubbo.provider.requests.total.aggregate",
"Aggregated Total Requests"),
+
PROVIDER_METRIC_REQUESTS_SUCCEED_AGG("dubbo.provider.requests.succeed.aggregate",
"Aggregated Succeed Requests"),
+
PROVIDER_METRIC_REQUESTS_FAILED_AGG("dubbo.provider.requests.failed.aggregate",
"Aggregated Failed Requests"),
+
PROVIDER_METRIC_REQUESTS_BUSINESS_FAILED_AGG("dubbo.provider.requests.business.failed.aggregate",
"Aggregated Business Failed Requests"),
+
PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG("dubbo.provider.requests.timeout.failed.aggregate",
"Aggregated timeout Failed Requests"),
+
PROVIDER_METRIC_REQUESTS_LIMIT_AGG("dubbo.provider.requests.limit.aggregate",
"Aggregated limit Requests"),
+
+ PROVIDER_METRIC_QPS("dubbo.provider.qps", "Query Per Seconds"),
+ PROVIDER_METRIC_RT_LAST("dubbo.provider.rt.last", "Last Response Time"),
+ PROVIDER_METRIC_RT_MIN("dubbo.provider.rt.min", "Min Response Time"),
+ PROVIDER_METRIC_RT_MAX("dubbo.provider.rt.max", "Max Response Time"),
+ PROVIDER_METRIC_RT_TOTAL("dubbo.provider.rt.total", "Total Response Time"),
+ PROVIDER_METRIC_RT_AVG("dubbo.provider.rt.avg", "Average Response Time"),
+ PROVIDER_METRIC_RT_P99("dubbo.provider.rt.p99", "Response Time P99"),
+ PROVIDER_METRIC_RT_P95("dubbo.provider.rt.p95", "Response Time P95"),
+
+ // consumer metrics key
;
private final String name;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
index d1c5b20d69..ddc30d5c68 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/metrics/collector/DefaultMetricsCollectorTest.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.metrics.event.MetricsEvent;
import org.apache.dubbo.common.metrics.event.RTEvent;
import org.apache.dubbo.common.metrics.event.RequestEvent;
import org.apache.dubbo.common.metrics.listener.MetricsListener;
+import org.apache.dubbo.common.metrics.model.MetricsKey;
import org.apache.dubbo.common.metrics.model.sample.GaugeMetricSample;
import org.apache.dubbo.common.metrics.model.sample.MetricSample;
import org.apache.dubbo.config.ApplicationConfig;
@@ -99,7 +100,7 @@ class DefaultMetricsCollectorTest {
return number.longValue();
}));
- Assertions.assertEquals(sampleMap.get("requests.processing"), 0L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_PROCESSING.getName()),
0L);
}
@Test
@@ -124,11 +125,11 @@ class DefaultMetricsCollectorTest {
return number.longValue();
}));
- Assertions.assertEquals(sampleMap.get("rt.last"), 0L);
- Assertions.assertEquals(sampleMap.get("rt.min"), 0L);
- Assertions.assertEquals(sampleMap.get("rt.max"), 10L);
- Assertions.assertEquals(sampleMap.get("rt.avg"), 5L);
- Assertions.assertEquals(sampleMap.get("rt.total"), 10L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_RT_LAST.getName()),
0L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_RT_MIN.getName()),
0L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_RT_MAX.getName()),
10L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_RT_AVG.getName()),
5L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_RT_TOTAL.getName()),
10L);
}
@Test
@@ -162,4 +163,4 @@ class DefaultMetricsCollectorTest {
return curEvent;
}
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
index dbbf5914ad..0f80c89658 100644
---
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
+++
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
@@ -148,22 +148,22 @@ public class AggregateMetricsCollector implements
MetricsCollector, MetricsListe
}
private void collectRequests(List<MetricSample> list) {
- totalRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_TOTAL_AGG, k.getTags(), REQUESTS,
v::get)));
- succeedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_SUCCEED_AGG, k.getTags(),
REQUESTS, v::get)));
- failedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_FAILED_AGG, k.getTags(), REQUESTS,
v::get)));
- businessFailedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_BUSINESS_FAILED_AGG, k.getTags(),
REQUESTS, v::get)));
- timeoutRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_TIMEOUT_AGG, k.getTags(),
REQUESTS, v::get)));
- limitRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_REQUESTS_LIMIT_AGG, k.getTags(), REQUESTS,
v::get)));
+ totalRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_AGG, k.getTags(),
REQUESTS, v::get)));
+ succeedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED_AGG, k.getTags(),
REQUESTS, v::get)));
+ failedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED_AGG, k.getTags(),
REQUESTS, v::get)));
+ businessFailedRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_BUSINESS_FAILED_AGG,
k.getTags(), REQUESTS, v::get)));
+ timeoutRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG, k.getTags(),
REQUESTS, v::get)));
+ limitRequests.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG, k.getTags(),
REQUESTS, v::get)));
}
private void collectQPS(List<MetricSample> list) {
- qps.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.METRIC_QPS, k.getTags(), QPS, () -> v.get() /
v.bucketLivedSeconds())));
+ qps.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_QPS, k.getTags(), QPS, () ->
v.get() / v.bucketLivedSeconds())));
}
private void collectRT(List<MetricSample> list) {
rt.forEach((k, v) -> {
- list.add(new GaugeMetricSample(MetricsKey.METRIC_RT_P99,
k.getTags(), RT, () -> v.quantile(0.99)));
- list.add(new GaugeMetricSample(MetricsKey.METRIC_RT_P95,
k.getTags(), RT, () -> v.quantile(0.95)));
+ list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_P99,
k.getTags(), RT, () -> v.quantile(0.99)));
+ list.add(new GaugeMetricSample(MetricsKey.PROVIDER_METRIC_RT_P95,
k.getTags(), RT, () -> v.quantile(0.95)));
});
}
}
diff --git
a/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java
b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java
index d654a68047..b7a4bf4f03 100644
---
a/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java
+++
b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java
@@ -104,12 +104,12 @@ class AggregateMetricsCollectorTest {
return number.longValue();
}));
- Assertions.assertEquals(sampleMap.get("requests.total.aggregate"), 1L);
- Assertions.assertEquals(sampleMap.get("requests.succeed.aggregate"),
1L);
- Assertions.assertEquals(sampleMap.get("requests.failed.aggregate"),
1L);
-
Assertions.assertEquals(sampleMap.get(MetricsKey.METRIC_REQUESTS_BUSINESS_FAILED_AGG.getName()),
1L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_AGG.getName()),
1L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED_AGG.getName()),
1L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED_AGG.getName()),
1L);
+
Assertions.assertEquals(sampleMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_BUSINESS_FAILED_AGG.getName()),
1L);
- Assertions.assertTrue(sampleMap.containsKey("qps"));
+
Assertions.assertTrue(sampleMap.containsKey(MetricsKey.PROVIDER_METRIC_QPS.getName()));
}
@Test
@@ -132,7 +132,7 @@ class AggregateMetricsCollectorTest {
return number.longValue();
}));
- Assertions.assertTrue(sampleMap.containsKey("rt.p99"));
- Assertions.assertTrue(sampleMap.containsKey("rt.p95"));
+
Assertions.assertTrue(sampleMap.containsKey(MetricsKey.PROVIDER_METRIC_RT_P99.getName()));
+
Assertions.assertTrue(sampleMap.containsKey(MetricsKey.PROVIDER_METRIC_RT_P95.getName()));
}
}
diff --git
a/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
index dd459a29d3..4f59ab4873 100644
---
a/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
+++
b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
@@ -103,10 +103,10 @@ class MetricsFilterTest {
}
Map<String, MetricSample> metricsMap = getMetricsMap();
- Assertions.assertTrue(metricsMap.containsKey("requests.failed"));
- Assertions.assertFalse(metricsMap.containsKey("requests.succeed"));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED.getName()));
+
Assertions.assertFalse(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName()));
- MetricSample sample = metricsMap.get("requests.failed");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_FAILED.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
@@ -131,10 +131,10 @@ class MetricsFilterTest {
}
Map<String, MetricSample> metricsMap = getMetricsMap();
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.METRIC_REQUEST_BUSINESS_FAILED.getName()));
- Assertions.assertFalse(metricsMap.containsKey("requests.succeed"));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUEST_BUSINESS_FAILED.getName()));
+
Assertions.assertFalse(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName()));
- MetricSample sample =
metricsMap.get(MetricsKey.METRIC_REQUEST_BUSINESS_FAILED.getName());
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUEST_BUSINESS_FAILED.getName());
Map<String, String> tags = sample.getTags();
@@ -163,9 +163,9 @@ class MetricsFilterTest {
}
}
Map<String, MetricSample> metricsMap = getMetricsMap();
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.METRIC_REQUESTS_TIMEOUT_AGG.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG.getName()));
- MetricSample sample =
metricsMap.get(MetricsKey.METRIC_REQUESTS_TIMEOUT_AGG.getName());
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG.getName());
Assertions.assertSame(((GaugeMetricSample)
sample).getSupplier().get().longValue(), count);
}
@@ -188,9 +188,9 @@ class MetricsFilterTest {
}
}
Map<String, MetricSample> metricsMap = getMetricsMap();
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.METRIC_REQUESTS_LIMIT_AGG.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG.getName()));
- MetricSample sample =
metricsMap.get(MetricsKey.METRIC_REQUESTS_LIMIT_AGG.getName());
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG.getName());
Assertions.assertSame(((GaugeMetricSample)
sample).getSupplier().get().longValue(), count);
}
@@ -206,10 +206,10 @@ class MetricsFilterTest {
filter.onResponse(result, invoker, invocation);
Map<String, MetricSample> metricsMap = getMetricsMap();
- Assertions.assertFalse(metricsMap.containsKey("requests.failed"));
- Assertions.assertTrue(metricsMap.containsKey("requests.succeed"));
+
Assertions.assertFalse(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUEST_BUSINESS_FAILED.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName()));
- MetricSample sample = metricsMap.get("requests.succeed");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
@@ -232,7 +232,7 @@ class MetricsFilterTest {
Map<String, MetricSample> metricsMap = getMetricsMap();
- MetricSample sample = metricsMap.get("requests.succeed");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
@@ -255,7 +255,7 @@ class MetricsFilterTest {
Map<String, MetricSample> metricsMap = getMetricsMap();
- MetricSample sample = metricsMap.get("requests.succeed");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
@@ -278,7 +278,7 @@ class MetricsFilterTest {
Map<String, MetricSample> metricsMap = getMetricsMap();
- MetricSample sample = metricsMap.get("requests.succeed");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_SUCCEED.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
@@ -305,7 +305,7 @@ class MetricsFilterTest {
Map<String, MetricSample> metricsMap = getMetricsMap();
- MetricSample sample = metricsMap.get("requests.processing");
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_PROCESSING.getName());
Map<String, String> tags = sample.getTags();
Assertions.assertEquals(tags.get(TAG_INTERFACE_KEY), INTERFACE_NAME);
