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/07/31 11:12:20 UTC
[dubbo] 01/01: Merge branch 'apache-3.2' into 3.2.5-release
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit aa54350c6f5abd0803ace8c14b9a731b69100d03
Merge: 30be46591f 1b8688c179
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Jul 31 19:11:49 2023 +0800
Merge branch 'apache-3.2' into 3.2.5-release
.../rpc/cluster/directory/AbstractDirectory.java | 31 ++---
.../rpc/cluster/directory/StaticDirectory.java | 7 +
.../filter/support/MetricsClusterFilter.java | 4 +-
.../dubbo/common/constants/CommonConstants.java | 3 +
.../common/logger/log4j2/Log4j2LoggerAdapter.java | 8 ++
.../dubbo/common/logger/slf4j/Slf4jLogger.java | 24 ++++
.../common/logger/slf4j/Slf4jLoggerAdapter.java | 10 +-
.../org/apache/dubbo/config/ServiceConfig.java | 30 ++--
.../config/deploy/DefaultApplicationDeployer.java | 9 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../DubboInfraBeanRegisterPostProcessor.java | 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 | 6 +-
dubbo-demo/dubbo-demo-xml/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 22 ++-
.../definition/protobuf/ProtobufTypeBuilder.java | 20 +--
.../org/apache/dubbo/metrics/MetricsConstants.java | 2 +-
.../metrics/collector/CombMetricsCollector.java | 6 +-
.../dubbo/metrics/data/BaseStatComposite.java | 15 +-
.../apache/dubbo/metrics/data/RtStatComposite.java | 16 +--
.../dubbo/metrics/data/ServiceStatComposite.java | 22 ++-
.../apache/dubbo/metrics/event/MetricsEvent.java | 15 +-
.../dubbo/metrics/event/MetricsEventBus.java | 36 ++++-
.../listener/AbstractMetricsKeyListener.java | 1 +
.../metrics/listener/AbstractMetricsListener.java | 2 +-
.../listener/MetricsApplicationListener.java | 29 +++-
.../metrics/listener/MetricsServiceListener.java | 5 +
.../dubbo/metrics/model/ApplicationMetric.java | 46 +++---
.../apache/dubbo/metrics/model/MetricsSupport.java | 26 ++--
.../dubbo/metrics/model/ServiceKeyMetric.java | 13 +-
.../apache/dubbo/metrics/model/key/MetricsCat.java | 2 +-
.../dubbo/metrics/model/key/MetricsKeyWrapper.java | 16 ---
.../dubbo/metrics/model/key/MetricsLevel.java | 2 +-
.../collector/AggregateMetricsCollector.java | 3 +
.../metrics/collector/DefaultMetricsCollector.java | 3 +-
.../dubbo/metrics/event/DefaultSubDispatcher.java | 7 +-
.../dubbo/metrics/event/RequestBeforeEvent.java | 51 -------
.../apache/dubbo/metrics/event/RequestEvent.java | 23 ++-
.../metrics/report/AbstractMetricsReporter.java | 17 +--
.../collector/AggregateMetricsCollectorTest.java | 6 +-
.../metrics/collector/DefaultCollectorTest.java | 4 +-
.../prometheus/PrometheusMetricsReporterTest.java | 2 +-
.../metrics/registry/RegistryMetricsConstants.java | 15 +-
.../collector/RegistryMetricsCollector.java | 47 +++++++
.../registry/collector/RegistryStatComposite.java | 81 +++++++++++
.../metrics/registry/event/RegistryEvent.java | 31 ++++-
.../registry/event/RegistrySpecListener.java | 154 +++++++++++++++++++++
.../registry/event/RegistrySubDispatcher.java | 59 +++-----
.../collector/RegistryMetricsCollectorTest.java | 28 ++--
.../metrics/collector/RegistryMetricsTest.java | 9 +-
.../collector/RegistryStatCompositeTest.java | 12 +-
.../dubbo/qos/protocol/QosProtocolWrapper.java | 6 -
.../java/org/apache/dubbo/qos/pu/QosDetector.java | 56 --------
.../org/apache/dubbo/qos/pu/QosHTTP1Detector.java | 39 ------
.../org/apache/dubbo/qos/pu/QosWireProtocol.java | 63 ---------
.../org/apache/dubbo/qos/pu/TelnetDetector.java | 100 -------------
.../org.apache.dubbo.remoting.api.WireProtocol | 1 -
.../apache/dubbo/qos/pu/QosWireProtocolTest.java | 41 ------
.../registry/client/AbstractServiceDiscovery.java | 10 +-
.../client/AbstractServiceDiscoveryFactory.java | 7 +-
.../dubbo/registry/client/NopServiceDiscovery.java | 6 +
.../dubbo/registry/client/ServiceDiscovery.java | 8 ++
.../registry/client/ServiceDiscoveryRegistry.java | 15 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 18 +++
.../client/ServiceDiscoveryRegistryFactory.java | 5 +
.../metadata/ServiceInstanceMetadataUtils.java | 22 ++-
.../StandardMetadataServiceURLBuilder.java | 2 +-
.../registry/integration/RegistryDirectory.java | 20 ++-
.../registry/integration/RegistryProtocol.java | 16 ++-
.../nacos/NacosServiceDiscoveryFactory.java | 14 ++
.../registry/zookeeper/ZookeeperRegistry.java | 2 +-
.../zookeeper/ZookeeperServiceDiscovery.java | 13 ++
.../zookeeper/curator/CuratorZookeeperClient.java | 16 ++-
...TpsLimitFilter.java => RpcExceptionFilter.java} | 48 +++----
.../apache/dubbo/rpc/filter/TpsLimitFilter.java | 12 +-
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 +
.../dubbo/rpc/filter/tps/TpsLimitFilterTest.java | 12 +-
.../rpc/protocol/rest/PathAndInvokerMapper.java | 19 ++-
.../pair/InvokerAndRestMethodMetadataPair.java | 36 ++++-
.../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 ++-
.../observability/pom.xml | 4 +-
dubbo-spring-boot/pom.xml | 2 +-
85 files changed, 916 insertions(+), 715 deletions(-)