This is an automated email from the ASF dual-hosted git repository.
albumenj 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 b1927e97bc Rename failed to unknown failed
b1927e97bc is described below
commit b1927e97bca51d8301385c5346e32849c0624c66
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Jan 20 12:24:17 2023 +0800
Rename failed to unknown failed
---
.../metrics/collector/DefaultMetricsCollector.java | 18 +++++++++---------
.../metrics/collector/stat/MetricsStatComposite.java | 4 ++--
.../dubbo/common/metrics/event/RequestEvent.java | 2 +-
.../dubbo/common/metrics/model/MetricsKey.java | 2 +-
.../collector/DefaultMetricsCollectorTest.java | 13 ++++++-------
.../metrics/collector/AggregateMetricsCollector.java | 20 ++++++++++----------
.../dubbo/metrics/filter/MetricsCollectExecutor.java | 8 ++++----
.../collector/AggregateMetricsCollectorTest.java | 11 +++++------
.../dubbo/metrics/filter/MetricsFilterTest.java | 20 ++++++++++----------
9 files changed, 48 insertions(+), 50 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 4fab8b79da..b83f165195 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
@@ -17,9 +17,6 @@
package org.apache.dubbo.common.metrics.collector;
-import static org.apache.dubbo.common.metrics.model.MetricsCategory.REQUESTS;
-import static org.apache.dubbo.common.metrics.model.MetricsCategory.RT;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -37,6 +34,9 @@ import
org.apache.dubbo.common.metrics.model.sample.GaugeMetricSample;
import org.apache.dubbo.common.metrics.model.sample.MetricSample;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import static org.apache.dubbo.common.metrics.model.MetricsCategory.REQUESTS;
+import static org.apache.dubbo.common.metrics.model.MetricsCategory.RT;
+
/**
* Default implementation of {@link MetricsCollector}
*/
@@ -80,11 +80,11 @@ public class DefaultMetricsCollector implements
MetricsCollector {
});
}
- public void increaseFailedRequests(String interfaceName,
- String methodName,
- String group,
- String version) {
- doExecute(RequestEvent.Type.FAILED,statHandler->{
+ public void increaseUnknownFailedRequests(String interfaceName,
+ String methodName,
+ String group,
+ String version) {
+ doExecute(RequestEvent.Type.UNKNOWN_FAILED, statHandler->{
statHandler.increase(interfaceName, methodName, group, version);
});
}
@@ -145,7 +145,7 @@ public class DefaultMetricsCollector implements
MetricsCollector {
doExecute(RequestEvent.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))));
- doExecute(RequestEvent.Type.FAILED,
MetricsStatHandler::get).filter(e->!e.isEmpty())
+ doExecute(RequestEvent.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))));
doExecute(RequestEvent.Type.PROCESSING,
MetricsStatHandler::get).filter(e->!e.isEmpty())
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/stat/MetricsStatComposite.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/stat/MetricsStatComposite.java
index dc75962b52..9c61b517dd 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/stat/MetricsStatComposite.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/collector/stat/MetricsStatComposite.java
@@ -120,10 +120,10 @@ public class MetricsStatComposite {
}
});
- stats.put(RequestEvent.Type.FAILED, new
DefaultMetricsStatHandler(applicationName) {
+ stats.put(RequestEvent.Type.UNKNOWN_FAILED, new
DefaultMetricsStatHandler(applicationName) {
@Override
public void doNotify(MethodMetric metric) {
- publishEvent(new RequestEvent(metric,
RequestEvent.Type.FAILED));
+ publishEvent(new RequestEvent(metric,
RequestEvent.Type.UNKNOWN_FAILED));
}
});
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/event/RequestEvent.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/event/RequestEvent.java
index 955c67b57d..06ca0efcfa 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/event/RequestEvent.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/metrics/event/RequestEvent.java
@@ -39,11 +39,11 @@ public class RequestEvent extends MetricsEvent {
public enum Type {
TOTAL,
SUCCEED,
- FAILED,
BUSINESS_FAILED,
REQUEST_TIMEOUT,
REQUEST_LIMIT,
PROCESSING,
+ UNKNOWN_FAILED,
TOTAL_FAILED
}
}
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 cc20b49b3d..2e5824c8e3 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
@@ -22,11 +22,11 @@ public enum MetricsKey {
// provider metrics key
PROVIDER_METRIC_REQUESTS("dubbo.provider.requests.total", "Total
Requests"),
PROVIDER_METRIC_REQUESTS_SUCCEED("dubbo.provider.requests.succeed.total",
"Succeed Requests"),
- PROVIDER_METRIC_REQUESTS_FAILED("dubbo.provider.requests.failed.total",
"Failed Requests"),
PROVIDER_METRIC_REQUEST_BUSINESS_FAILED("dubbo.provider.requests.business.failed.total","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_FAILED("dubbo.provider.requests.unknown.failed.total",
"Unknown Failed Requests"),
PROVIDER_METRIC_REQUESTS_TOTAL_FAILED("dubbo.provider.requests.failed.total",
"Total Failed Requests"),
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 11001a8a62..bbbd3d809c 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
@@ -17,6 +17,11 @@
package org.apache.dubbo.common.metrics.collector;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
import org.apache.dubbo.common.metrics.event.MetricsEvent;
import org.apache.dubbo.common.metrics.event.RTEvent;
import org.apache.dubbo.common.metrics.event.RequestEvent;
@@ -27,17 +32,11 @@ import
org.apache.dubbo.common.metrics.model.sample.MetricSample;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY;
@@ -77,7 +76,7 @@ class DefaultMetricsCollectorTest {
collector.increaseTotalRequests(interfaceName, methodName, group,
version);
collector.increaseProcessingRequests(interfaceName, methodName, group,
version);
collector.increaseSucceedRequests(interfaceName, methodName, group,
version);
- collector.increaseFailedRequests(interfaceName, methodName, group,
version);
+ collector.increaseUnknownFailedRequests(interfaceName, methodName,
group, version);
List<MetricSample> samples = collector.collect();
for (MetricSample sample : samples) {
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 1def3cdd60..9c0b19dd51 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
@@ -17,6 +17,11 @@
package org.apache.dubbo.metrics.collector;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
import org.apache.dubbo.common.metrics.collector.DefaultMetricsCollector;
import org.apache.dubbo.common.metrics.collector.MetricsCollector;
import org.apache.dubbo.common.metrics.event.MetricsEvent;
@@ -35,13 +40,8 @@ import org.apache.dubbo.metrics.aggregate.TimeWindowCounter;
import org.apache.dubbo.metrics.aggregate.TimeWindowQuantile;
import org.apache.dubbo.rpc.model.ApplicationModel;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import static org.apache.dubbo.common.metrics.model.MetricsCategory.REQUESTS;
import static org.apache.dubbo.common.metrics.model.MetricsCategory.QPS;
+import static org.apache.dubbo.common.metrics.model.MetricsCategory.REQUESTS;
import static org.apache.dubbo.common.metrics.model.MetricsCategory.RT;
/**
@@ -54,7 +54,7 @@ public class AggregateMetricsCollector implements
MetricsCollector, MetricsListe
private final ConcurrentMap<MethodMetric, TimeWindowCounter> totalRequests
= new ConcurrentHashMap<>();
private final ConcurrentMap<MethodMetric, TimeWindowCounter>
succeedRequests = new ConcurrentHashMap<>();
- private final ConcurrentMap<MethodMetric, TimeWindowCounter>
failedRequests = new ConcurrentHashMap<>();
+ private final ConcurrentMap<MethodMetric, TimeWindowCounter>
unknownFailedRequests = new ConcurrentHashMap<>();
private final ConcurrentMap<MethodMetric, TimeWindowCounter>
businessFailedRequests = new ConcurrentHashMap<>();
private final ConcurrentMap<MethodMetric, TimeWindowCounter>
timeoutRequests = new ConcurrentHashMap<>();
private final ConcurrentMap<MethodMetric, TimeWindowCounter> limitRequests
= new ConcurrentHashMap<>();
@@ -115,8 +115,8 @@ public class AggregateMetricsCollector implements
MetricsCollector, MetricsListe
case SUCCEED:
counter =
ConcurrentHashMapUtils.computeIfAbsent(succeedRequests, metric, k -> new
TimeWindowCounter(bucketNum, timeWindowSeconds));
break;
- case FAILED:
- counter =
ConcurrentHashMapUtils.computeIfAbsent(failedRequests, metric, k -> new
TimeWindowCounter(bucketNum, timeWindowSeconds));
+ case UNKNOWN_FAILED:
+ counter =
ConcurrentHashMapUtils.computeIfAbsent(unknownFailedRequests, metric, k -> new
TimeWindowCounter(bucketNum, timeWindowSeconds));
break;
case BUSINESS_FAILED:
counter =
ConcurrentHashMapUtils.computeIfAbsent(businessFailedRequests, metric, k -> new
TimeWindowCounter(bucketNum, timeWindowSeconds));
@@ -156,7 +156,7 @@ public class AggregateMetricsCollector implements
MetricsCollector, MetricsListe
private void collectRequests(List<MetricSample> list) {
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)));
+ unknownFailedRequests.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)));
diff --git
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/MetricsCollectExecutor.java
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/MetricsCollectExecutor.java
index cd56b387c2..8d91748b41 100644
---
a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/MetricsCollectExecutor.java
+++
b/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/MetricsCollectExecutor.java
@@ -17,9 +17,6 @@
package org.apache.dubbo.metrics.filter;
-import static
org.apache.dubbo.common.constants.MetricsConstants.METRIC_FILTER_START_TIME;
-import static org.apache.dubbo.rpc.support.RpcUtils.isGenericCall;
-
import java.util.function.Supplier;
import org.apache.dubbo.common.metrics.collector.DefaultMetricsCollector;
@@ -28,6 +25,9 @@ import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.RpcInvocation;
+import static
org.apache.dubbo.common.constants.MetricsConstants.METRIC_FILTER_START_TIME;
+import static org.apache.dubbo.rpc.support.RpcUtils.isGenericCall;
+
public class MetricsCollectExecutor {
private final DefaultMetricsCollector collector;
@@ -79,7 +79,7 @@ public class MetricsCollectExecutor {
break;
default:
- collector.increaseFailedRequests(interfaceName,
methodName, group, version);
+ collector.increaseUnknownFailedRequests(interfaceName,
methodName, group, version);
}
}
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 b7a4bf4f03..d0a8da3b7b 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
@@ -17,6 +17,10 @@
package org.apache.dubbo.metrics.collector;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import org.apache.dubbo.common.metrics.collector.DefaultMetricsCollector;
import org.apache.dubbo.common.metrics.model.MetricsKey;
import org.apache.dubbo.common.metrics.model.sample.GaugeMetricSample;
@@ -25,16 +29,11 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.MetricsConfig;
import org.apache.dubbo.config.nested.AggregationConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY;
import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY;
@@ -85,7 +84,7 @@ class AggregateMetricsCollectorTest {
AggregateMetricsCollector collector = new
AggregateMetricsCollector(applicationModel);
defaultCollector.increaseTotalRequests(interfaceName, methodName,
group, version);
defaultCollector.increaseSucceedRequests(interfaceName, methodName,
group, version);
- defaultCollector.increaseFailedRequests(interfaceName, methodName,
group, version);
+ defaultCollector.increaseUnknownFailedRequests(interfaceName,
methodName, group, version);
defaultCollector.businessFailedRequests(interfaceName,methodName,group,version);
List<MetricSample> samples = collector.collect();
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 21395042c6..e558fee95f 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
@@ -17,15 +17,6 @@
package org.apache.dubbo.metrics.filter;
-import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE;
-import static
org.apache.dubbo.common.constants.CommonConstants.GENERIC_PARAMETER_DESC;
-import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
-import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY;
-import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY;
-import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_VERSION_KEY;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -47,6 +38,15 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE;
+import static
org.apache.dubbo.common.constants.CommonConstants.GENERIC_PARAMETER_DESC;
+import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY;
+import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY;
+import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY;
+import static
org.apache.dubbo.common.constants.MetricsConstants.TAG_VERSION_KEY;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
class MetricsFilterTest {
private ApplicationModel applicationModel;
@@ -90,7 +90,7 @@ class MetricsFilterTest {
}
@Test
- void testFailedRequests() {
+ void testUnknownFailedRequests() {
collector.setCollectEnabled(true);
given(invoker.invoke(invocation)).willThrow(new
RpcException("failed"));
initParam();
