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/06/12 12:54:43 UTC
[dubbo] branch 3.3 updated (642f741dba -> fd14e7b76f)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 642f741dba Merge branch 'apache-3.2' into apache-3.3
add f95111029b Fix injvm invoker check (#12479)
add 24935b1bb0 Correcting spelling mistakes (#12480)
add 40b805ee88 Fix hashCode change in 2.6 DIY ConsistentHashLoadBalance (#12468)
add 0f7a62a8ff Fix long time await in ThreadlessExecutor (#12484)
add c7a69a60a8 Check registry in checkAndUpdateSubConfigs (#12486)
add 8a2dffd55e Add some nacos connection logs (#12494)
add 6325a765bc feat: add springboot-starter for nacos and zookeeper (#12488)
add 51f60139f0 Feature/dubbo3.2 export path matcher&invoker to user (#12482)
add 0f336d8736 fix dependency check (#12505)
add 784edd7a85 Support Reference check timeout (#12506)
add 15ec892cb8 Bump bytebuddy.version from 1.14.4 to 1.14.5 (#12502)
add 4c67c26c8e Bump license-maven-plugin from 2.0.1 to 2.1.0 (#12501)
add a01ac38cbf Bump fabric8_kubernetes_version from 6.6.2 to 6.7.1 (#12500)
add fc6fbd60f9 Bump opentelemetry-bom from 1.26.0 to 1.27.0 (#12499)
add e92f85d980 Support client gracefully shutdown (#12504)
add 3fa518505f Add log for remote configuration. (#12294)
add bde608ec3c fail fast when protocol exp (#12361)
add dd94c1561a fix router match condition (#12491)
add 2cb12ff9a6 Fix AbstractProxyProtocol compatibility (#12507)
new fd14e7b76f Merge branch 'apache-3.2' into apache-3.3
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:
.artifacts | 4 +
.../cluster/configurator/AbstractConfigurator.java | 2 +-
.../configurator/parser/model/ConditionMatch.java | 18 +++-
.../configurator/parser/model/ParamMatch.java | 4 +-
.../condition/config/ListenableStateRouter.java | 4 +-
.../rpc/cluster/router/tag/TagStateRouter.java | 4 +-
.../rpc/cluster/router/tag/model/ParamMatch.java | 2 +-
.../support/wrapper/ScopeClusterInvoker.java | 36 +++++--
.../configurator/parser/ConfigParserTest.java | 18 ++--
.../support/wrapper/ScopeClusterInvokerTest.java | 3 +-
.../common/threadpool/ThreadlessExecutor.java | 8 +-
.../java/org/apache/dubbo/config/ModuleConfig.java | 13 +++
.../common/threadpool/ThreadlessExecutorTest.java | 13 ++-
.../alibaba/dubbo/container/page/PageServlet.java | 2 +-
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 16 +++
.../org/apache/dubbo/config/ReferenceConfig.java | 4 +
.../config/deploy/DefaultApplicationDeployer.java | 6 ++
.../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +-
.../context/DubboSpringInitCustomizerHolder.java | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../support/nacos/NacosDynamicConfiguration.java | 17 ++--
.../dubbo/demo/rest/api/JaxRsRestDemoService.java | 2 +-
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 20 ++++
.../dubbo/metadata/AbstractServiceNameMapping.java | 26 ++---
.../apache/dubbo/metadata/rest/PathMatcher.java | 73 ++++++++++++--
.../dubbo/metadata/rest/ServiceRestMetadata.java | 1 +
.../org/apache/dubbo/metadata/PathMatcherTest.java | 35 +++++++
.../registry/client/ServiceDiscoveryRegistry.java | 4 +-
.../registry/integration/RegistryDirectory.java | 12 +++
.../registry/nacos/NacosConnectionManager.java | 6 +-
.../java/org/apache/dubbo/remoting/Constants.java | 2 +
.../remoting/exchange/support/DefaultFuture.java | 33 +++++--
.../support/header/HeaderExchangeChannel.java | 10 +-
.../support/header/HeaderExchangeHandler.java | 10 +-
.../exchange/support/DefaultFutureTest.java | 4 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 16 ++-
.../dubbo/rpc/protocol/AbstractProtocol.java | 3 +-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 87 ++++++++++------
.../rpc/protocol/rest/PathAndInvokerMapper.java | 26 ++---
.../dubbo/rpc/protocol/rest/RestProtocol.java | 1 -
.../rpc/protocol/rest/RestRPCInvocationUtil.java | 109 +++++++++++++++++++--
.../rpc/protocol/rest/constans/RestConstant.java | 5 +
.../protocol/rest/handler/NettyHttpHandler.java | 14 ++-
.../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 +++++
.../protocol/rest/rest/TestGetInvokerService.java | 15 ++-
.../rest/rest/TestGetInvokerServiceImpl.java | 57 +++++++++++
.../dubbo-nacos-spring-boot-starter}/pom.xml | 29 +++---
.../pom.xml | 77 +++------------
.../dubbo-zookeeper-spring-boot-starter}/pom.xml | 31 +++---
.../observability}/autoconfigure/pom.xml | 0
.../DubboMicrometerTracingAutoConfiguration.java | 0
.../DubboObservationAutoConfiguration.java | 0
.../autoconfigure/ObservabilityUtils.java | 0
.../autoconfigure/ObservationHandlerGrouping.java | 0
.../ObservationRegistryPostProcessor.java | 0
.../ConditionalOnDubboTracingEnable.java | 0
.../brave/BraveAutoConfiguration.java | 0
.../exporter/otlp/OtlpAutoConfiguration.java | 0
.../autoconfigure/exporter/zipkin/HttpSender.java | 0
.../exporter/zipkin/ZipkinAutoConfiguration.java | 0
.../exporter/zipkin/ZipkinConfigurations.java | 0
.../exporter/zipkin/ZipkinRestTemplateSender.java | 0
.../exporter/zipkin/ZipkinWebClientSender.java | 0
.../ZipkinRestTemplateBuilderCustomizer.java | 0
.../ZipkinWebClientBuilderCustomizer.java | 0
.../otel/OpenTelemetryAutoConfiguration.java | 0
.../src/main/resources/META-INF/spring.factories | 0
...rk.boot.autoconfigure.AutoConfiguration.imports | 0
...bboMicrometerTracingAutoConfigurationTests.java | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../observability}/pom.xml | 4 +-
.../dubbo-spring-boot-starters}/pom.xml | 34 +++----
dubbo-spring-boot/pom.xml | 4 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 15 +++
.../java/org/apache/dubbo/dependency/FileTest.java | 2 +-
pom.xml | 2 +-
80 files changed, 713 insertions(+), 267 deletions(-)
copy dubbo-demo/dubbo-demo-interface/src/main/java/org/apache/dubbo/demo/rest/api/ExceptionMapperService.java => dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/rest/TestGetInvokerService.java (80%)
create mode 100644 dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/rest/TestGetInvokerServiceImpl.java
copy {dubbo-metadata/dubbo-metadata-report-nacos => dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-nacos-spring-boot-starter}/pom.xml (61%)
copy {dubbo-dependencies/dubbo-dependencies-zookeeper-curator5 => dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter}/pom.xml (59%)
copy {dubbo-metadata/dubbo-metadata-report-nacos => dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter}/pom.xml (61%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/resources/META-INF/spring.factories (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-observability-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/pom.xml (96%)
copy {dubbo-metadata/dubbo-metadata-report-nacos => dubbo-spring-boot/dubbo-spring-boot-starters}/pom.xml (57%)
[dubbo] 01/01: Merge branch 'apache-3.2' into apache-3.3
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit fd14e7b76f0cdc8cebf7db686a07a3b27a95fadd
Merge: 642f741dba 2cb12ff9a6
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Jun 12 20:52:32 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
# dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
.artifacts | 4 +
.../cluster/configurator/AbstractConfigurator.java | 2 +-
.../configurator/parser/model/ConditionMatch.java | 18 +++-
.../configurator/parser/model/ParamMatch.java | 4 +-
.../condition/config/ListenableStateRouter.java | 4 +-
.../rpc/cluster/router/tag/TagStateRouter.java | 4 +-
.../rpc/cluster/router/tag/model/ParamMatch.java | 2 +-
.../support/wrapper/ScopeClusterInvoker.java | 36 +++++--
.../configurator/parser/ConfigParserTest.java | 18 ++--
.../support/wrapper/ScopeClusterInvokerTest.java | 3 +-
.../common/threadpool/ThreadlessExecutor.java | 8 +-
.../java/org/apache/dubbo/config/ModuleConfig.java | 13 +++
.../common/threadpool/ThreadlessExecutorTest.java | 13 ++-
.../alibaba/dubbo/container/page/PageServlet.java | 2 +-
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 16 +++
.../org/apache/dubbo/config/ReferenceConfig.java | 4 +
.../config/deploy/DefaultApplicationDeployer.java | 6 ++
.../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +-
.../context/DubboSpringInitCustomizerHolder.java | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../support/nacos/NacosDynamicConfiguration.java | 17 +--
.../dubbo/demo/rest/api/JaxRsRestDemoService.java | 2 +-
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 20 ++++
.../dubbo/metadata/AbstractServiceNameMapping.java | 26 ++---
.../apache/dubbo/metadata/rest/PathMatcher.java | 73 +++++++++++--
.../dubbo/metadata/rest/ServiceRestMetadata.java | 1 +
.../org/apache/dubbo/metadata/PathMatcherTest.java | 35 +++++++
.../registry/client/ServiceDiscoveryRegistry.java | 4 +-
.../registry/integration/RegistryDirectory.java | 12 +++
.../registry/nacos/NacosConnectionManager.java | 6 +-
.../java/org/apache/dubbo/remoting/Constants.java | 2 +
.../remoting/exchange/support/DefaultFuture.java | 33 ++++--
.../support/header/HeaderExchangeChannel.java | 10 +-
.../support/header/HeaderExchangeHandler.java | 10 +-
.../exchange/support/DefaultFutureTest.java | 4 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 16 ++-
.../dubbo/rpc/protocol/AbstractProtocol.java | 3 +-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 87 ++++++++++------
.../rpc/protocol/rest/PathAndInvokerMapper.java | 26 ++---
.../dubbo/rpc/protocol/rest/RestProtocol.java | 1 -
.../rpc/protocol/rest/RestRPCInvocationUtil.java | 109 +++++++++++++++++--
.../rpc/protocol/rest/constans/RestConstant.java | 5 +
.../protocol/rest/handler/NettyHttpHandler.java | 14 ++-
.../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 +++++
.../protocol/rest/rest/TestGetInvokerService.java | 30 ++----
.../rest/rest/TestGetInvokerServiceImpl.java | 57 ++++++++++
.../dubbo-nacos-spring-boot-starter/pom.xml | 44 ++++++++
.../pom.xml | 115 +++++++++++++++++++++
.../dubbo-zookeeper-spring-boot-starter/pom.xml | 48 +++++++++
.../observability}/autoconfigure/pom.xml | 0
.../DubboMicrometerTracingAutoConfiguration.java | 0
.../DubboObservationAutoConfiguration.java | 0
.../autoconfigure/ObservabilityUtils.java | 0
.../autoconfigure/ObservationHandlerGrouping.java | 0
.../ObservationRegistryPostProcessor.java | 0
.../ConditionalOnDubboTracingEnable.java | 0
.../brave/BraveAutoConfiguration.java | 0
.../exporter/otlp/OtlpAutoConfiguration.java | 0
.../autoconfigure/exporter/zipkin/HttpSender.java | 0
.../exporter/zipkin/ZipkinAutoConfiguration.java | 0
.../exporter/zipkin/ZipkinConfigurations.java | 0
.../exporter/zipkin/ZipkinRestTemplateSender.java | 0
.../exporter/zipkin/ZipkinWebClientSender.java | 0
.../ZipkinRestTemplateBuilderCustomizer.java | 0
.../ZipkinWebClientBuilderCustomizer.java | 0
.../otel/OpenTelemetryAutoConfiguration.java | 0
.../src/main/resources/META-INF/spring.factories | 0
...rk.boot.autoconfigure.AutoConfiguration.imports | 0
...bboMicrometerTracingAutoConfigurationTests.java | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../observability}/pom.xml | 4 +-
.../dubbo-spring-boot-starters/pom.xml | 41 ++++++++
dubbo-spring-boot/pom.xml | 4 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 15 +++
.../java/org/apache/dubbo/dependency/FileTest.java | 2 +-
pom.xml | 2 +-
80 files changed, 901 insertions(+), 171 deletions(-)
diff --cc dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
index 8344a7ca17,f42a2e7266..8ef0acad5b
--- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
@@@ -32,10 -30,7 +32,9 @@@ import org.apache.dubbo.rpc.protocol.Ab
import org.apache.dubbo.rpc.protocol.AbstractProtocol;
import org.apache.dubbo.rpc.protocol.rest.annotation.consumer.HttpConnectionPreBuildIntercept;
import org.apache.dubbo.rpc.protocol.rest.annotation.metadata.MetadataResolver;
+import org.apache.dubbo.rpc.protocol.rest.deploy.ServiceDeployer;
+import org.apache.dubbo.rpc.protocol.rest.deploy.ServiceDeployerManager;
-
import java.util.Map;
import java.util.Objects;
import java.util.Set;
diff --cc dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
index e69e3b98ea,a9182429f5..0d2aabbfd3
--- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
+++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
@@@ -63,9 -61,7 +63,9 @@@ class FileTest
ignoredModulesInDubboAll.add(Pattern.compile("dubbo-distribution"));
ignoredModulesInDubboAll.add(Pattern.compile("dubbo-metadata-processor"));
ignoredModulesInDubboAll.add(Pattern.compile("dubbo-native.*"));
+ ignoredModulesInDubboAll.add(Pattern.compile("dubbo-config-spring6.*"));
- ignoredModulesInDubboAll.add(Pattern.compile("dubbo-spring-boot.*"));
+ ignoredModulesInDubboAll.add(Pattern.compile(".*spring-boot.*"));
+ ignoredModulesInDubboAll.add(Pattern.compile("dubbo-annotation-processor.*"));
ignoredModulesInDubboAll.add(Pattern.compile("dubbo-maven-plugin"));
}