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 2024/10/21 02:30:54 UTC
(dubbo) 01/02: Merge branch 'refs/heads/apache-3.3' into apache-3.4
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.4
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 5edc3fc41eb6462b1d1486dd9c67fead9280211d
Merge: adb5399580 947626cbdc
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Oct 21 10:30:24 2024 +0800
Merge branch 'refs/heads/apache-3.3' into apache-3.4
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-plugin/dubbo-rest-jaxrs/pom.xml
# dubbo-plugin/dubbo-rest-spring/pom.xml
# pom.xml
.artifacts | 1 -
.../org/apache/dubbo/common/utils/LockUtils.java | 26 ++--
.../org/apache/dubbo/config/nested/RestConfig.java | 13 ++
.../apache/dubbo/config/nested/ServletConfig.java | 16 +++
.../apache/dubbo/common/utils/LockUtilsTest.java | 22 ++-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
dubbo-config/dubbo-config-spring6/pom.xml | 2 +-
...eferenceAnnotationWithAotBeanPostProcessor.java | 10 ++
.../dubbo-demo-native-consumer/pom.xml | 6 +-
.../dubbo-demo-native-provider/pom.xml | 6 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 71 ++++++----
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 5 -
dubbo-maven-plugin/pom.xml | 4 +-
.../metadata/DubboMetadataServiceV2Triple.java | 8 +-
.../org/apache/dubbo/gen/AbstractGenerator.java | 4 +-
.../dubbo/gen/tri/Dubbo3TripleGenerator.java | 2 +-
.../tri/reactive/ReactorDubbo3TripleGenerator.java | 2 +-
.../src/main/resources/Dubbo3TripleStub.mustache | 8 +-
.../apache/dubbo/qos/QosScopeModelInitializer.java | 6 +-
.../dubbo/qos/command/ActuatorCommandExecutor.java | 63 +++++++++
.../apache/dubbo/qos/command/ActuatorExecutor.java | 14 +-
dubbo-plugin/dubbo-rest-jaxrs/pom.xml | 2 +-
dubbo-plugin/dubbo-rest-spring/pom.xml | 2 +-
.../tri/rest/support/spring/SpringRestToolKit.java | 2 +-
.../rpc/protocol/tri/servlet/TripleFilter.java | 4 +-
.../registry/client/ServiceDiscoveryRegistry.java | 1 +
.../listener/ServiceInstancesChangedListener.java | 50 ++++---
.../registry/client/metadata/MetadataUtils.java | 2 +
.../api/connection/AbstractConnectionClient.java | 11 +-
.../SingleProtocolConnectionManager.java | 34 +++--
.../dubbo/remoting/http12/HttpConstants.java | 7 +
.../dubbo/remoting/http12/HttpHeaderNames.java | 2 +
.../apache/dubbo/remoting/http12/HttpMetadata.java | 5 +
.../apache/dubbo/remoting/http12/HttpUtils.java | 13 +-
...ver.java => Http1SseServerChannelObserver.java} | 19 +--
.../remoting/http12/message/codec/CodecUtils.java | 30 ++--
.../remoting/http12/message/codec/JsonPbCodec.java | 3 +-
.../h2/NettyHttp2ProtocolSelectorHandler.java | 5 +-
.../dubbo-remoting-zookeeper-curator5/pom.xml | 2 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 2 +-
.../tri/h12/AbstractServerTransportListener.java | 16 ++-
.../DefaultHttp11ServerTransportListener.java | 8 +-
.../h12/http1/Http1UnaryServerChannelObserver.java | 17 ++-
.../http2/GenericHttp2ServerTransportListener.java | 9 +-
.../h12/http2/Http2SseServerChannelObserver.java | 25 ++--
.../mapping/DefaultRequestMappingRegistry.java | 56 +++++++-
.../protocol/tri/rest/mapping/RequestMapping.java | 16 ++-
.../tri/rest/support/basic/RestProtocolTest.groovy | 49 ++++++-
.../rpc/protocol/tri/rest/service/DemoService.java | 4 +
.../protocol/tri/rest/service/DemoServiceImpl.java | 5 +
.../dubbo/rpc/protocol/tri/test/TestResponse.java | 9 +-
.../rpc/protocol/tri/test/TestRunnerImpl.java | 2 +-
.../dubbo-spring-boot-3-autoconfigure/pom.xml | 7 +-
.../DubboTriple3AutoConfiguration.java | 25 +++-
.../dubbo-spring-boot-actuator/README.md | 119 +++++++++++++++-
.../dubbo-spring-boot-actuator/pom.xml | 7 +
.../DubboEndpointAnnotationAutoConfiguration.java | 6 +-
...etadataEndpoint.java => DubboQosEndpoints.java} | 28 +++-
.../META-INF/dubbo-endpoints-default.properties | 19 ++-
...bboEndpointAnnotationAutoConfigurationTest.java | 6 +-
.../boot/actuate/endpoint/DubboEndpointTest.java | 10 +-
.../dubbo-spring-boot-autoconfigure/pom.xml | 110 +++++++++++++++
.../DubboTripleAutoConfiguration.java | 25 +++-
.../DubboMicrometerTracingAutoConfiguration.java | 22 +--
.../DubboObservationAutoConfiguration.java | 42 +++---
.../observability}/ObservabilityUtils.java | 2 +-
.../observability}/ObservationHandlerGrouping.java | 2 +-
.../ObservationRegistryPostProcessor.java | 2 +-
.../ConditionalOnDubboTracingEnable.java | 4 +-
.../brave/BraveAutoConfiguration.java | 8 +-
.../otel/OpenTelemetryAutoConfiguration.java | 8 +-
.../observability}/otlp/OtlpAutoConfiguration.java | 6 +-
.../observability}/zipkin/HttpSender.java | 2 +-
.../zipkin/ZipkinAutoConfiguration.java | 14 +-
.../zipkin/ZipkinConfigurations.java | 8 +-
.../zipkin/ZipkinRestTemplateSender.java | 2 +-
.../zipkin/ZipkinWebClientSender.java | 2 +-
.../ZipkinRestTemplateBuilderCustomizer.java | 2 +-
.../ZipkinWebClientBuilderCustomizer.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 8 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 6 +
...bboMicrometerTracingAutoConfigurationTests.java | 4 +-
.../dubbo-spring-boot-compatible/actuator/pom.xml | 7 +
.../DubboExtensionEndpointAutoConfiguration.java | 38 +++++
.../configuration/DubboActuatorProperties.java} | 42 +++---
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
.../dubbo-zookeeper-spring-boot-starter/pom.xml | 2 +-
.../observability/autoconfigure/pom.xml | 156 ---------------------
.../src/main/resources/META-INF/spring.factories | 8 --
...rk.boot.autoconfigure.AutoConfiguration.imports | 6 -
.../src/test/resources/log4j2-test.xml | 29 ----
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../observability/pom.xml | 49 -------
dubbo-spring-boot/pom.xml | 46 ++++++
dubbo-test/dubbo-dependencies-all/pom.xml | 5 -
dubbo-test/dubbo-test-check/pom.xml | 8 +-
pom.xml | 8 +-
102 files changed, 1071 insertions(+), 557 deletions(-)
diff --cc dubbo-dependencies-bom/pom.xml
index 8709a5d3e8,78e5583635..af57e04b3a
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -183,11 -184,11 +184,11 @@@
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
- <open_feign_version>3.1.5</open_feign_version>
- <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
- <jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version>
+ <open_feign_version>3.1.9</open_feign_version>
+ <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
+ <jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
- <revision>3.4.0-beta.1-SNAPSHOT</revision>
- <revision>3.3.2-SNAPSHOT</revision>
++ <revision>3.4.0-beta.2-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index f927d7a0d5,40795e00a3..a6a48a6712
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@@ -39,7 -39,7 +39,7 @@@
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
- <revision>3.4.0-beta.1-SNAPSHOT</revision>
- <revision>3.3.2-SNAPSHOT</revision>
++ <revision>3.4.0-beta.2-SNAPSHOT</revision>
</properties>
<dependencies>
diff --cc dubbo-plugin/dubbo-rest-jaxrs/pom.xml
index 2ff20fa4bc,6682a1f6c5..e7add64e47
--- a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml
+++ b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml
@@@ -104,7 -104,7 +104,7 @@@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
- <version>3.4.0-beta.1-SNAPSHOT</version>
- <version>3.3.2-SNAPSHOT</version>
++ <version>3.4.0-beta.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --cc dubbo-plugin/dubbo-rest-spring/pom.xml
index 0dacef4345,61fa5752d5..c00696a71c
--- a/dubbo-plugin/dubbo-rest-spring/pom.xml
+++ b/dubbo-plugin/dubbo-rest-spring/pom.xml
@@@ -113,7 -113,7 +113,7 @@@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
- <version>3.4.0-beta.1-SNAPSHOT</version>
- <version>3.3.2-SNAPSHOT</version>
++ <version>3.4.0-beta.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --cc pom.xml
index 8f6d06a1e0,dc7be436f8..1fd31efa32
--- a/pom.xml
+++ b/pom.xml
@@@ -149,7 -149,7 +149,7 @@@
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
- <revision>3.4.0-beta.1-SNAPSHOT</revision>
- <revision>3.3.2-SNAPSHOT</revision>
++ <revision>3.4.0-beta.2-SNAPSHOT</revision>
</properties>
<dependencyManagement>