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:19 UTC
[dubbo] branch 3.2.5-release updated (30be46591f -> aa54350c6f)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 30be46591f Prepare 3.2.5 release
add 345e58fc59 fix: CuratorWatch unwatch , childListener is null (#12742)
add e205190833 Bump snappy-java from 1.1.10.1 to 1.1.10.2 (#12745)
add 74c1ebefe0 Bump jetcd-launcher from 0.7.5 to 0.7.6 (#12747)
add 2aab3e7ef0 Bump jetcd-core from 0.7.5 to 0.7.6 (#12749)
add b7ad0c95b3 Bump micrometer-bom from 1.11.1 to 1.11.2 (#12748)
add 7a51c2379f Bump reactor-core from 3.5.7 to 3.5.8 (#12744)
add c54e1b63f9 fix dubbo provider lose when zk restart (#12646) (#12740)
add 12f2222326 Add enable collect judgment (#12666)
add 8c20e80b8e Bump micrometer-tracing-bom from 1.1.2 to 1.1.3 (#12743)
add 848a57725d Bump micrometer-core from 1.11.1 to 1.11.2 (#12746)
add ba5ca1c150 Remove -1 delay usage (#12767)
add 2e60ddfdaf Bump org.springframework.boot:spring-boot-starter-test (#12786)
add 70fa0f4626 Bump org.xerial.snappy:snappy-java from 1.1.10.2 to 1.1.10.3 (#12785)
add 0b1c5fcc13 Bump netty4_version from 4.1.94.Final to 4.1.95.Final (#12784)
add 41521188b1 Bump spring-boot.version from 2.7.13 to 2.7.14 (#12783)
add b7302842e8 Bump org.springframework.boot:spring-boot-dependencies (#12789)
add 1a7cdf2004 Bump org.springframework.boot:spring-boot-maven-plugin (#12790)
add 925e81ae5f Bump org.springframework.security:spring-security-bom (#12781)
add 3c5cb3bc01 remove unused dependency (#12772)
add 7c7f3db772 multiple registration cannot be achieved when nacos application level registration (#12731)
add 879fd81128 fix log level is null in Slf4j and fix not valid in Log4j2 (#12671)
add 5caa8524a9 Check if delay is -1 before property for manual publish (#12794)
add 9837cfbb0b Fix register failed if re-register service discovery (#12795)
add ee05d54f92 Support real RpcException be thrown. (#12771)
add 97227e4e8e PutAll configs to application environment instead of override for spring properties (#12812)
add 2488b08d3e bugFix/fix is available timeout (#12796)
add 25547158d2 ProtobufTypeBuilder extension load on protobuf dependency (#12799)
add 1e29cdc1fa support reExport (#12809)
add 2e04208405 Disable QoS as Port Unification protocol (#12813)
add 9ee5bf6efc Update StandardMetadataServiceURLBuilder.java (#12684)
add 22acf36800 Merge branch 'apache-3.1' into apache-3.2
add e93c5cf777 RequestEvent optimization (#12655)
add 10870708eb :fire: remove applicationName in jvm metric (#12770)
add 0add70e3f5 Support multi registries metrics key (#12582)
add 1b8688c179 :ambulance: avoid metric bug (#12817)
new aa54350c6f Merge branch 'apache-3.2' into 3.2.5-release
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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} | 56 ++++----
.../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 ++-
.../dubbo/rpc/filter/RpcExceptionFilter.java | 28 +++-
.../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, 860 insertions(+), 726 deletions(-)
delete mode 100644 dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/event/RequestBeforeEvent.java
copy dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/data/ApplicationStatComposite.java => dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryStatComposite.java} (50%)
create mode 100644 dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/RegistrySpecListener.java
delete mode 100644 dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/pu/QosDetector.java
delete mode 100644 dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/pu/QosHTTP1Detector.java
delete mode 100644 dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/pu/QosWireProtocol.java
delete mode 100644 dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/pu/TelnetDetector.java
delete mode 100644 dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.api.WireProtocol
delete mode 100644 dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/pu/QosWireProtocolTest.java
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java => dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/RpcExceptionFilter.java (66%)
[dubbo] 01/01: Merge branch 'apache-3.2' into 3.2.5-release
Posted by al...@apache.org.
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(-)