This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 1d282052ae Merge branch 'apache-3.1' into apache-3.2
add 3c518e9443 Refactor metrics data Composite (#12036)
No new revisions were added by this update.
Summary of changes:
.../cluster/filter/MetricsClusterFilterTest.java | 3 +-
.../src/main/resources/application.yml | 11 +-
.../org/apache/dubbo/metrics/MetricsConstants.java | 2 +-
.../metrics/data/ApplicationStatComposite.java | 80 +++++++++
.../dubbo/metrics/data/BaseStatComposite.java | 90 ++++++++++
.../apache/dubbo/metrics/data/RtStatComposite.java | 100 +++++++++++
.../dubbo/metrics/data/ServiceStatComposite.java | 70 ++++++++
.../apache/dubbo/metrics/event/MetricsEvent.java | 2 +-
.../dubbo/metrics/model/ApplicationMetric.java | 1 +
.../apache/dubbo/metrics/model/MetricsSupport.java | 1 +
.../model/container/AtomicLongContainer.java | 3 +-
.../model/container/LongAccumulatorContainer.java | 3 +-
.../metrics/model/container/LongContainer.java | 4 +-
.../dubbo/metrics/model/{ => key}/MetricsKey.java | 2 +-
.../metrics/model/{ => key}/MetricsKeyWrapper.java | 30 ++--
.../metrics/model/{ => key}/MetricsLevel.java | 2 +-
.../dubbo/metrics/model/key/MetricsPlaceType.java | 25 +--
.../dubbo/metrics/model/{ => key}/TypeWrapper.java | 2 +-
.../metrics/model/sample/GaugeMetricSample.java | 2 +-
.../apache/dubbo/metrics/report/MetricsExport.java | 9 +-
.../collector/AggregateMetricsCollector.java | 2 +-
.../collector/ConfigCenterMetricsCollector.java | 2 +-
.../metrics/collector/DefaultMetricsCollector.java | 2 +-
.../collector/HistogramMetricsCollector.java | 2 +-
.../collector/sample/MethodMetricsSampler.java | 2 +-
.../collector/sample/MetricsCountSampler.java | 2 +-
.../sample/SimpleMetricsCountSampler.java | 2 +-
.../collector/sample/ThreadPoolMetricsSampler.java | 2 +-
.../sample/ThreadRejectMetricsCountSampler.java | 2 +-
.../collector/AggregateMetricsCollectorTest.java | 2 +-
.../dubbo/metrics/filter/MetricsFilterTest.java | 8 +-
.../collector/DefaultMetricsCollectorTest.java | 2 +-
.../dubbo/metrics/sampler/CountSamplerTest.java | 2 +-
.../dubbo/metrics/metadata/MetadataConstants.java | 27 ---
.../metrics/metadata/MetadataMetricsConstants.java | 41 +++++
.../collector/MetadataMetricsCollector.java | 33 ++--
.../collector/stat/MetadataStatComposite.java | 179 -------------------
.../metrics/metadata/event/MetadataEvent.java | 4 +-
.../event/MetadataMetricsEventMulticaster.java | 16 +-
.../metrics/metadata/type/ApplicationType.java | 3 +-
.../dubbo/metrics/metadata/type/ServiceType.java | 2 +-
.../metadata/MetadataMetricsCollectorTest.java | 42 ++---
.../metadata/MetadataStatCompositeTest.java | 42 +++--
.../dubbo/metrics/registry/RegistryConstants.java | 35 ----
.../metrics/registry/RegistryMetricsConstants.java | 44 +++++
.../collector/RegistryMetricsCollector.java | 38 ++--
.../collector/stat/RegistryStatComposite.java | 194 ---------------------
.../metrics/registry/event/RegistryEvent.java | 13 +-
.../event/RegistryMetricsEventMulticaster.java | 32 ++--
.../registry/event/type/ApplicationType.java | 2 +-
.../metrics/registry/event/type/ServiceType.java | 2 +-
.../collector/RegistryMetricsCollectorTest.java | 40 ++---
.../collector/RegistryMetricsSampleTest.java | 20 +--
.../collector/RegistryStatCompositeTest.java | 41 +++--
54 files changed, 688 insertions(+), 636 deletions(-)
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/data/ApplicationStatComposite.java
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/data/BaseStatComposite.java
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/data/RtStatComposite.java
create mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/data/ServiceStatComposite.java
rename
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/{
=> key}/MetricsKey.java (99%)
rename
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/{
=> key}/MetricsKeyWrapper.java (74%)
rename
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/{
=> key}/MetricsLevel.java (95%)
copy
dubbo-common/src/main/java/org/apache/dubbo/config/nested/PropagationConfig.java
=>
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsPlaceType.java
(64%)
rename
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/{
=> key}/TypeWrapper.java (97%)
delete mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/MetadataConstants.java
create mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/MetadataMetricsConstants.java
delete mode 100644
dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/stat/MetadataStatComposite.java
delete mode 100644
dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/RegistryConstants.java
create mode 100644
dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/RegistryMetricsConstants.java
delete mode 100644
dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/stat/RegistryStatComposite.java
