This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 48cc5b24de65ce25fe1f7654d58d85c63cbcc406 Merge: 37f150263a 70a948a3d4 Author: Albumen Kevin <[email protected]> AuthorDate: Fri Jun 30 22:45:24 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # pom.xml .../rpc/cluster/directory/AbstractDirectory.java | 24 ++++++++++++++++++++++ .../cluster/support/AbstractClusterInvoker.java | 2 +- .../support/wrapper/ScopeClusterInvoker.java | 9 ++++++++ .../apache/dubbo/config/spring/ServiceBean.java | 14 +++++++++---- .../annotation/ServiceAnnotationPostProcessor.java | 1 + .../spring/schema/DubboBeanDefinitionParser.java | 3 +++ .../dubbo/config/spring/util/DubboBeanUtils.java | 6 +++--- .../dubbo/config/spring/ServiceBeanTest.java | 4 ++-- .../spring/status/DataSourceStatusCheckerTest.java | 4 ++-- dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo/metrics/data/MethodStatComposite.java | 3 +-- .../dubbo/metrics/data/ServiceStatComposite.java | 5 ++--- .../metrics/collector/DefaultCollectorTest.java | 8 ++++---- .../dubbo/metrics/filter/MetricsFilterTest.java | 11 +++++----- .../metadata/MetadataMetricsCollectorTest.java | 5 +++-- .../collector/RegistryMetricsCollectorTest.java | 19 +++++++++-------- .../client/migration/MigrationInvoker.java | 9 ++++++++ .../registry/integration/RegistryDirectory.java | 6 ++++++ .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 8 +++++++- .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 6 +++++- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 6 +++++- 21 files changed, 114 insertions(+), 41 deletions(-)
