You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/09/19 03:10:47 UTC
[dubbo] 01/01: Merge branch '3.2' into dependabot/maven/io.projectreactor-reactor-core-3.5.10
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch dependabot/maven/io.projectreactor-reactor-core-3.5.10
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0a26c3a537203d46853e64da5deaf388d79d8148
Merge: 045795c7c5 139a62ebb9
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Sep 19 11:10:41 2023 +0800
Merge branch '3.2' into dependabot/maven/io.projectreactor-reactor-core-3.5.10
.../filter/support/MetricsClusterFilter.java | 5 ++-
.../support/FailSafeClusterInvokerTest.java | 3 +-
.../support/FailbackClusterInvokerTest.java | 8 ++--
.../org/apache/dubbo/config/MetricsConfig.java | 14 +++++++
.../org/apache/dubbo/config/ServiceConfig.java | 12 +++---
.../src/main/resources/META-INF/dubbo.xsd | 5 +++
.../dubbo/metrics/aggregate/TimeWindowCounter.java | 2 +-
.../dubbo/metrics/data/MethodStatComposite.java | 5 ++-
.../apache/dubbo/metrics/data/RtStatComposite.java | 4 +-
.../dubbo/metrics/event/MetricsInitEvent.java | 4 +-
.../apache/dubbo/metrics/model/MethodMetric.java | 43 +++++++++++++++++-----
.../collector/AggregateMetricsCollector.java | 29 ++++++++-------
.../collector/HistogramMetricsCollector.java | 5 ++-
.../apache/dubbo/metrics/event/RequestEvent.java | 8 ++--
.../apache/dubbo/metrics/filter/MetricsFilter.java | 5 ++-
.../collector/AggregateMetricsCollectorTest.java | 14 +++----
.../metrics/collector/DefaultCollectorTest.java | 6 +--
.../metrics/collector/InitServiceMetricsTest.java | 3 +-
.../metrics/metrics/model/MethodMetricTest.java | 24 +++++++++++-
19 files changed, 143 insertions(+), 56 deletions(-)