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 59832d45d460733bf5788ea11ab99a9e30e312e9 Merge: fe55491d4a 736d9965db Author: Albumen Kevin <[email protected]> AuthorDate: Sat Apr 15 07:28:32 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 | 14 +- dubbo-dependencies-bom/pom.xml | 2 +- .../org/apache/dubbo/metrics/MetricsConstants.java | 2 + .../collector/ApplicationMetricsCollector.java | 10 +- .../metrics/collector/CombMetricsCollector.java | 89 +++++++++++++ .../dubbo/metrics/collector/MetricsCollector.java | 4 +- .../collector/ServiceMetricsCollector.java} | 34 ++--- .../apache/dubbo/metrics/event/MetricsEvent.java | 25 +++- .../dubbo/metrics/event/MetricsEventBus.java | 12 +- .../metrics/event/MetricsEventMulticaster.java | 4 +- .../event/SimpleMetricsEventMulticaster.java | 4 +- .../metrics/listener/AbstractMetricsListener.java | 70 ++++++++++ .../listener/MetricsApplicationListener.java | 54 ++++++++ .../metrics/listener/MetricsLifeListener.java | 4 +- .../metrics/listener/MetricsServiceListener.java | 56 ++++++++ .../dubbo/metrics/model/key/CategoryOverall.java} | 41 +++--- .../apache/dubbo/metrics/model/key/MetricsCat.java | 54 ++++++++ .../dubbo/metrics/model/key/MetricsKeyWrapper.java | 4 - .../dubbo/metrics/model/key/TypeWrapper.java | 10 +- .../event/SimpleMetricsEventMulticasterTest.java | 12 +- .../metrics/filter/MethodMetricsInterceptor.java | 6 +- .../metrics/metadata/MetadataMetricsConstants.java | 20 ++- .../collector/MetadataMetricsCollector.java | 55 ++------ .../metrics/metadata/event/MetadataEvent.java | 53 +++----- .../metrics/metadata/event/MetadataListener.java | 67 ---------- .../event/MetadataMetricsEventMulticaster.java | 87 ++++++------- .../metrics/metadata/type/ApplicationType.java | 52 -------- .../metadata/MetadataStatCompositeTest.java | 14 +- .../metrics/registry/RegistryMetricsConstants.java | 34 ++++- .../collector/RegistryMetricsCollector.java | 63 ++------- .../metrics/registry/event/RegistryEvent.java | 82 ++---------- .../metrics/registry/event/RegistryListener.java | 67 ---------- .../event/RegistryMetricsEventMulticaster.java | 141 ++++++++++----------- .../metrics/registry/event/type/ServiceType.java | 50 -------- .../collector/RegistryMetricsSampleTest.java | 7 +- .../collector/RegistryStatCompositeTest.java | 12 +- .../dubbo/rpc/stub/UnaryStubMethodHandler.java | 6 +- 37 files changed, 647 insertions(+), 674 deletions(-)
