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 d050b9c6ec73ff4e10342f66cf1c808260f72dea Merge: bcd5caf7df 34c5bbf713 Author: crazyhzm <[email protected]> AuthorDate: Thu Sep 28 17:17:17 2023 +0800 Merge branch '3.2' into 3.3 .github/workflows/build-and-test-pr.yml | 14 +- .github/workflows/build-and-test-scheduled-3.0.yml | 251 --------------------- .github/workflows/build-and-test-scheduled-3.1.yml | 4 - .github/workflows/build-and-test-scheduled-3.2.yml | 36 +-- .github/workflows/release-test.yml | 49 ++-- .../dubbo/common/bytecode/ClassGenerator.java | 13 +- .../org/apache/dubbo/common/bytecode/Wrapper.java | 6 +- .../dubbo/common/constants/MetricsConstants.java | 2 + .../threadpool/MemorySafeLinkedBlockingQueue.java | 6 +- .../threadpool/support/AbortPolicyWithReport.java | 59 ++--- .../url/component/param/DynamicParamTable.java | 19 -- .../java/org/apache/dubbo/common/utils/JRE.java | 14 ++ .../org/apache/dubbo/config/MetricsConfig.java | 13 ++ .../rpc/model/ReflectionServiceDescriptor.java | 13 +- .../dubbo/common/bytecode/ClassGeneratorTest.java | 33 +++ .../StringToBlockingDequeConverterTest.java | 7 +- .../multiple/StringToDequeConverterTest.java | 7 +- .../multiple/StringToListConverterTest.java | 7 +- .../StringToNavigableSetConverterTest.java | 7 +- .../multiple/StringToSortedSetConverterTest.java | 7 +- .../MemorySafeLinkedBlockingQueueTest.java | 4 +- .../rpc/model/ReflectionServiceDescriptorTest.java | 11 + .../org/apache/dubbo/rpc/support/DemoService1.java | 25 ++ .../apache/dubbo/rpc/support/DemoService1Impl.java | 34 +++ .../builders/InternalServiceConfigBuilder.java | 5 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../META-INF/isolation/dubbo-consumer.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- .../dubbo-demo-spring-boot-consumer/pom.xml | 2 +- .../dubbo-demo-spring-boot-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 4 +- .../report/support/AbstractMetadataReportTest.java | 11 +- .../metrics/listener/AbstractMetricsListener.java | 11 +- .../dubbo/metrics/model/ApplicationMetric.java | 11 +- .../apache/dubbo/metrics/model/MetricsSupport.java | 16 +- .../dubbo/metrics/aggregate/SlidingWindowTest.java | 5 +- .../dubbo/metrics/model/ApplicationMetricTest.java | 99 ++++++++ .../metrics/report/AbstractMetricsReporter.java | 7 +- .../metrics/metrics/model/MethodMetricTest.java | 2 - .../dubbo/rpc/filter/ActiveLimitFilterTest.java | 2 +- .../transport/netty4/NettyClientToServerTest.java | 2 +- .../transport/netty4/ReplierDispatcherTest.java | 18 +- .../src/test/resources/log4j.properties | 7 + .../rpc/protocol/ReferenceCountInvokerWrapper.java | 9 +- .../protocol/dubbo/DecodeableRpcInvocation.java | 5 +- .../dubbo/rpc/protocol/dubbo/DubboCodec.java | 2 - .../serialize/hessian2/Hessian2FactoryManager.java | 33 +-- .../hessian2/Hessian2SerializerFactory.java | 4 +- dubbo-spring-boot/pom.xml | 2 +- dubbo-test/dubbo-test-check/pom.xml | 2 +- .../dubbo/registry/xds/XdsServiceDiscovery.java | 3 + 54 files changed, 489 insertions(+), 430 deletions(-)
