This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2.7-release in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 53f1391c9210fda7a4eefdc4d22ac7ce34929f79 Merge: 4655d783e6 70600eb632 Author: Albumen Kevin <[email protected]> AuthorDate: Sat Sep 30 10:12:18 2023 +0800 Merge branch 'apache-3.2' into 3.2.7-release .../dubbo/common/constants/MetricsConstants.java | 2 + .../org/apache/dubbo/config/MetricsConfig.java | 13 ++++ .../rpc/model/ReflectionServiceDescriptor.java | 13 +++- .../rpc/model/ReflectionServiceDescriptorTest.java | 11 ++++ .../org/apache/dubbo/rpc/support/DemoService1.java | 11 ++-- .../apache/dubbo/rpc/support/DemoService1Impl.java | 32 +++------- .../builders/InternalServiceConfigBuilder.java | 5 +- .../dubbo/metrics/collector/MetricsCollector.java | 8 +++ .../metrics/data/ApplicationStatComposite.java | 14 ++++- .../dubbo/metrics/data/BaseStatComposite.java | 10 +++ .../dubbo/metrics/data/MethodStatComposite.java | 17 ++++- .../apache/dubbo/metrics/data/RtStatComposite.java | 18 +++++- .../dubbo/metrics/data/ServiceStatComposite.java | 29 ++++++++- .../apache/dubbo/metrics/report/MetricsExport.java | 7 +++ .../dubbo/metrics/report/MetricsReporter.java | 4 +- .../collector/ConfigCenterMetricsCollector.java | 15 ++++- .../collector/AggregateMetricsCollector.java | 66 +++++++++++++------ .../metrics/collector/DefaultMetricsCollector.java | 20 ++++++ .../collector/HistogramMetricsCollector.java | 9 ++- .../metrics/collector/sample/MetricsSampler.java | 9 +++ .../collector/sample/ThreadPoolMetricsSampler.java | 25 +++++--- .../sample/ThreadRejectMetricsCountSampler.java | 15 ++++- .../metrics/report/AbstractMetricsReporter.java | 73 ++++++++++++++-------- .../metrics/report/nop/NopMetricsReporter.java | 2 +- .../collector/MetadataMetricsCollector.java | 4 ++ .../prometheus/NopPrometheusMetricsReporter.java | 2 +- .../prometheus/PrometheusMetricsReporter.java | 11 ++-- .../prometheus/PrometheusMetricsReporterCmd.java | 2 +- .../prometheus/PrometheusMetricsReporterTest.java | 7 ++- .../PrometheusMetricsThreadPoolTest.java | 5 +- .../collector/RegistryMetricsCollector.java | 7 +++ .../registry/collector/RegistryStatComposite.java | 22 ++++++- .../command/impl/DefaultMetricsReporterCmd.java | 2 +- .../AuthenticationExceptionTranslatorFilter.java | 6 +- .../ContextHolderAuthenticationPrepareFilter.java | 13 +++- .../ContextHolderAuthenticationResolverFilter.java | 10 ++- .../model/SecurityScopeModelInitializer.java | 23 +++++-- .../dubbo/spring/security/utils/SecurityNames.java | 2 + .../dubbo/registry/xds/XdsServiceDiscovery.java | 3 + 39 files changed, 424 insertions(+), 123 deletions(-)
