This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.2.0-beta.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2.0-beta.4-release by this
push:
new d11fe5fb0d metrics key duplication (#11349)
d11fe5fb0d is described below
commit d11fe5fb0d3a4f141d4aae165c2987d87aa9ffeb
Author: jojocodeX <[email protected]>
AuthorDate: Thu Jan 19 14:39:34 2023 +0800
metrics key duplication (#11349)
---
.../common/metrics/collector/DefaultMetricsCollector.java | 6 +++---
.../org/apache/dubbo/common/metrics/model/MetricsKey.java | 4 ++++
.../org/apache/dubbo/metrics/filter/MetricsFilterTest.java | 14 +++++++-------
3 files changed, 14 insertions(+), 10 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 bc034ccff5..40133561f3 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
@@ -155,13 +155,13 @@ public class DefaultMetricsCollector implements
MetricsCollector {
.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.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG, k.getTags(),
REQUESTS, v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT, 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.PROVIDER_METRIC_REQUESTS_LIMIT_AGG, k.getTags(),
REQUESTS, v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT, k.getTags(),
REQUESTS, v::get))));
doExecute(RequestEvent.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_AGG,
k.getTags(), REQUESTS, v::get))));
+ .ifPresent(map-> map.forEach((k, v) -> list.add(new
GaugeMetricSample(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED,
k.getTags(), REQUESTS, v::get))));
}
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 28f19c7c48..326397fe92 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
@@ -25,6 +25,10 @@ public enum MetricsKey {
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_TIMEOUT("dubbo.provider.requests.timeout.total",
"Total Timeout Failed Requests"),
+ PROVIDER_METRIC_REQUESTS_LIMIT("dubbo.provider.requests.limit.total",
"Total Limit Failed Requests"),
+
PROVIDER_METRIC_REQUESTS_TOTAL_FAILED("dubbo.provider.requests.failed.total",
"Total Failed 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"),
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 df12399b36..21395042c6 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
@@ -146,7 +146,7 @@ class MetricsFilterTest {
@Test
- void testTimeoutAndFailedRequests() {
+ void testTimeoutRequests() {
collector.setCollectEnabled(true);
given(invoker.invoke(invocation)).willThrow(new
RpcException(RpcException.TIMEOUT_EXCEPTION));
@@ -163,13 +163,13 @@ class MetricsFilterTest {
}
}
Map<String, MetricSample> metricsMap = getMetricsMap();
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG.getName()));
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED_AGG.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED.getName()));
- MetricSample timeoutSample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT_AGG.getName());
+ MetricSample timeoutSample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TIMEOUT.getName());
Assertions.assertSame(((GaugeMetricSample)
timeoutSample).getSupplier().get().longValue(), count);
- GaugeMetricSample failedSample =
(GaugeMetricSample)metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED_AGG.getName());
+ GaugeMetricSample failedSample =
(GaugeMetricSample)metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_TOTAL_FAILED.getName());
Assertions.assertSame(failedSample.getSupplier().get().longValue(),
count);
}
@@ -191,9 +191,9 @@ class MetricsFilterTest {
}
}
Map<String, MetricSample> metricsMap = getMetricsMap();
-
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG.getName()));
+
Assertions.assertTrue(metricsMap.containsKey(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT.getName()));
- MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT_AGG.getName());
+ MetricSample sample =
metricsMap.get(MetricsKey.PROVIDER_METRIC_REQUESTS_LIMIT.getName());
Assertions.assertSame(((GaugeMetricSample)
sample).getSupplier().get().longValue(), count);
}
