This is an automated email from the ASF dual-hosted git repository. crazyhzm pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0f61286a7811c7f07e4c3bd1939d075b7ed00f78 Merge: abb2d3834d 60a4aa19f4 Author: crazyhzm <[email protected]> AuthorDate: Wed Sep 20 15:32:19 2023 +0800 Merge branch '3.2' into 3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml .../support/FailSafeClusterInvokerTest.java | 3 +- .../support/FailbackClusterInvokerTest.java | 8 +- .../threadpool/support/AbortPolicyWithReport.java | 6 +- .../org/apache/dubbo/config/MetricsConfig.java | 14 ++++ .../org/apache/dubbo/config/ServiceConfig.java | 12 +-- .../src/main/resources/META-INF/dubbo.xsd | 5 ++ .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 12 +-- .../dubbo/validation/filter/ValidationFilter.java | 8 +- .../validation/support/jvalidation/JValidator.java | 66 ++++++++-------- .../support/jvalidation/JValidatorNew.java | 66 ++++++++-------- .../support/jvalidation/JValidatorTest.java | 92 +++++++++++++++++++++- .../jvalidation/mock/JValidatorTestTarget.java | 38 +++++++++ .../dubbo/metrics/aggregate/TimeWindowCounter.java | 2 +- .../dubbo/metrics/data/MethodStatComposite.java | 5 +- .../apache/dubbo/metrics/data/RtStatComposite.java | 4 +- .../org/apache/dubbo/metrics/event/EmptyEvent.java | 36 --------- .../dubbo/metrics/event/MetricsInitEvent.java | 4 +- .../event/SimpleMetricsEventMulticaster.java | 7 -- .../apache/dubbo/metrics/model/MethodMetric.java | 43 +++++++--- .../event/SimpleMetricsEventMulticasterTest.java | 10 --- .../collector/AggregateMetricsCollector.java | 29 ++++--- .../collector/HistogramMetricsCollector.java | 5 +- .../apache/dubbo/metrics/event/RequestEvent.java | 8 +- .../apache/dubbo/metrics/filter/MetricsFilter.java | 5 +- .../filter/support/MetricsClusterFilter.java | 5 +- .../collector/AggregateMetricsCollectorTest.java | 14 ++-- .../metrics/collector/DefaultCollectorTest.java | 6 +- .../metrics/collector/InitServiceMetricsTest.java | 3 +- .../metrics/metrics/model/MethodMetricTest.java | 24 +++++- .../remoting/exchange/support/DefaultFuture.java | 2 +- .../exchange/support/DefaultFutureTest.java | 37 +++++++++ .../apache/dubbo/rpc/filter/ExceptionFilter.java | 2 +- .../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +- .../rpc/protocol/tri/call/AbstractServerCall.java | 3 + .../observability/pom.xml | 6 +- dubbo-spring-boot/pom.xml | 2 +- .../xds/istio/IstioCitadelCertificateSigner.java | 2 +- 40 files changed, 408 insertions(+), 194 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 03c36be9dd,517f89606a..b796d48520 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -133,10 -133,9 +133,10 @@@ <commons_lang3_version>3.12.0</commons_lang3_version> <protostuff_version>1.8.0</protostuff_version> <envoy_api_version>0.1.35</envoy_api_version> - <micrometer.version>1.11.3</micrometer.version> + <micrometer.version>1.11.4</micrometer.version> - + <opentelemetry.version>1.26.0</opentelemetry.version> + <zipkin-reporter.version>2.16.4</zipkin-reporter.version> - <micrometer-tracing.version>1.1.4</micrometer-tracing.version> + <micrometer-tracing.version>1.1.5</micrometer-tracing.version> <t_digest.version>3.3</t_digest.version> <prometheus_client.version>0.16.0</prometheus_client.version> <reactive.version>1.0.4</reactive.version> @@@ -150,9 -149,7 +150,9 @@@ <tomcat_embed_version>8.5.87</tomcat_embed_version> <jetcd_version>0.7.6</jetcd_version> <nacos_version>2.2.4</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.version> - <grpc.version>1.57.2</grpc.version> + <grpc.version>1.58.0</grpc.version> <grpc_contrib_verdion>0.8.1</grpc_contrib_verdion> <jprotoc_version>1.2.2</jprotoc_version> <!-- Log libs -->
