You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/01/20 03:28:25 UTC
[dubbo] 01/01: Merge branch 'apache-3.2' into 3.2.0-beta.4-release
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
commit 0d749715efb93696178ee94e79341f58eec47078
Merge: d11fe5fb0d d2eb0ef458
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jan 20 11:27:55 2023 +0800
Merge branch 'apache-3.2' into 3.2.0-beta.4-release
.github/dependabot.yaml | 15 ++++
.../dubbo/rpc/cluster/CacheableRouterFactory.java | 3 +-
.../cluster/loadbalance/RoundRobinLoadBalance.java | 9 ++-
.../loadbalance/ShortestResponseLoadBalance.java | 3 +-
.../router/mesh/util/MeshRuleDispatcher.java | 8 +-
.../cluster/router/script/ScriptStateRouter.java | 15 ++--
.../router/state/CacheableStateRouterFactory.java | 3 +-
.../common/beans/factory/ScopeBeanFactory.java | 6 +-
.../org/apache/dubbo/common/bytecode/Wrapper.java | 16 ++--
.../dubbo/common/cache/FileCacheStoreFactory.java | 10 ++-
.../AbstractDynamicConfigurationFactory.java | 6 +-
.../apache/dubbo/common/convert/ConverterUtil.java | 9 ++-
.../dubbo/common/deploy/AbstractDeployer.java | 4 +-
.../apache/dubbo/common/logger/LoggerFactory.java | 9 ++-
.../metrics/collector/DefaultMetricsCollector.java | 4 +-
.../collector/stat/MetricsStatComposite.java | 49 +++++++-----
.../dubbo/common/metrics/model/MetricsKey.java | 25 +++---
.../common/store/support/SimpleDataStore.java | 5 +-
.../manager/DefaultExecutorRepository.java | 5 +-
.../common/url/component/ServiceConfigURL.java | 24 +++---
.../dubbo/common/utils/ConcurrentHashMapUtils.java | 57 ++++++++++++++
.../org/apache/dubbo/config/AbstractConfig.java | 10 ++-
.../rpc/model/FrameworkServiceRepository.java | 5 +-
.../dubbo/rpc/model/ModuleServiceRepository.java | 9 ++-
.../collector/DefaultMetricsCollectorTest.java | 2 +-
.../common/utils/ConcurrentHashMapUtilsTest.java | 31 ++++----
.../dubbo/config/bootstrap/DubboBootstrap.java | 12 ++-
.../dubbo/config/utils/SimpleReferenceCache.java | 13 +--
.../spring/reference/ReferenceBeanManager.java | 12 +--
.../config/spring/AbstractRegistryService.java | 7 +-
.../dubbo/config/spring/SimpleRegistryService.java | 21 ++---
.../support/nacos/NacosDynamicConfiguration.java | 7 +-
.../support/zookeeper/CacheListener.java | 6 +-
dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-demo/dubbo-demo-triple/pom.xml | 2 +-
dubbo-demo/dubbo-demo-xml/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 20 ++---
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../store/zookeeper/ZookeeperMetadataReport.java | 6 +-
.../collector/AggregateMetricsCollector.java | 39 ++++-----
.../dubbo/monitor/support/MonitorFilter.java | 3 +-
.../apache/dubbo/monitor/dubbo/DubboMonitor.java | 3 +-
dubbo-native-plugin/pom.xml | 2 +-
.../META-INF/native-image/reflect-config.json | 92 ++++++++++++++++++++++
.../META-INF/native-image/resource-config.json | 6 ++
.../client/AbstractServiceDiscoveryFactory.java | 3 +-
.../client/ReflectionBasedServiceDiscovery.java | 3 +-
.../registry/client/ServiceDiscoveryRegistry.java | 3 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 6 +-
.../DefaultMigrationAddressComparator.java | 6 +-
.../client/migration/MigrationRuleListener.java | 6 +-
.../support/CacheableFailbackRegistry.java | 14 ++--
.../multiple/MultipleServiceDiscovery.java | 6 +-
.../registry/nacos/NacosNamingServiceWrapper.java | 16 ++--
.../registry/zookeeper/ZookeeperRegistry.java | 9 ++-
.../MultiplexProtocolConnectionManager.java | 3 +-
.../exchange/PortUnificationExchanger.java | 5 +-
.../dubbo/remoting/transport/CodecSupport.java | 6 +-
.../zookeeper/AbstractZookeeperClient.java | 9 ++-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
.../java/org/apache/dubbo/rpc/AdaptiveMetrics.java | 32 ++++----
.../main/java/org/apache/dubbo/rpc/RpcStatus.java | 11 +--
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 8 +-
.../dubbo/rpc/protocol/AbstractProtocol.java | 3 +-
.../dubbo/rpc/protocol/grpc/GrpcProtocol.java | 21 ++---
.../dubbo/rpc/protocol/rest/RestProtocol.java | 8 +-
dubbo-rpc/dubbo-rpc-triple/pom.xml | 2 +-
.../rpc/protocol/tri/SingleProtobufUtils.java | 4 +-
dubbo-spring-boot/pom.xml | 2 +-
dubbo-xds/pom.xml | 2 +-
.../xds/util/protocol/AbstractProtocol.java | 3 +-
.../rpc/cluster/router/xds/EdsEndpointManager.java | 5 +-
.../cluster/router/xds/RdsRouteRuleManager.java | 8 +-
pom.xml | 8 +-
78 files changed, 537 insertions(+), 284 deletions(-)
diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/metrics/model/MetricsKey.java
index 326397fe92,3defc6a47e..cc20b49b3d
--- 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
@@@ -20,15 -20,11 +20,15 @@@ package org.apache.dubbo.common.metrics
public enum MetricsKey {
// 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("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_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 --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index e5d217eec2,2903ce5b4c..58f85297ea
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@@ -32,9 -32,9 +32,9 @@@
<packaging>pom</packaging>
<properties>
- <revision>3.2.0-beta.4-SNAPSHOT</revision>
+ <revision>3.2.0-beta.4</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <curator_version>5.1.0</curator_version>
+ <curator_version>4.3.0</curator_version>
<zookeeper_version>3.7.0</zookeeper_version>
</properties>
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 32dc448517,40ce49f395..ad088cba6e
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@@ -32,9 -32,9 +32,9 @@@
<packaging>pom</packaging>
<properties>
- <revision>3.2.0-beta.4-SNAPSHOT</revision>
+ <revision>3.2.0-beta.4</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <curator_version>4.2.0</curator_version>
+ <curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>
</properties>