This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from fe55491d4a Merge branch 'apache-3.2' into apache-3.3
add 302f57c7ee bug fix (#12088)
add b81c141486 Refactor Metrics Key&Collector (#12083)
add 5cbd95b5d9 Prepare 3.2.0 release
add a7833d3096 Merge branch '3.2.0-release' into apache-3.2
add 07f0ff8688 Bump to 3.2.1-SNAPSHOT
add 5308cc81bf Fix tri headerfilter 3.1 (#12070)
add d73aca8847 Upgrade jprotoc and grpc version (#12086)
add 129b4fa2fd fix tri stub exception (#12093)
add 318614005d Prepare 3.0.15 release
add 65c6fff2f3 Merge branch '3.1.9-release' into apache-3.1
add d6e32f201b Bump to 3.1.10-SNAPSHOT
add 736d9965db Merge branch 'apache-3.1' into apache-3.2
new 59832d45d4 Merge branch 'apache-3.2' into apache-3.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 ++++++++
...{MetricsPlaceType.java => CategoryOverall.java} | 32 +++--
.../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 --------
.../dubbo/metrics/metadata/type/ServiceType.java | 50 --------
.../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 +-
38 files changed, 647 insertions(+), 715 deletions(-)
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/CombMetricsCollector.java
rename
dubbo-metrics/{dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/type/ApplicationType.java
=>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/ServiceMetricsCollector.java}
(56%)
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/AbstractMetricsListener.java
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsApplicationListener.java
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsServiceListener.java
copy
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/{MetricsPlaceType.java
=> CategoryOverall.java} (55%)
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsCat.java
delete mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/event/MetadataListener.java
delete mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/type/ApplicationType.java
delete mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/type/ServiceType.java
delete mode 100644
dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/RegistryListener.java
delete mode 100644
dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/type/ServiceType.java