(dubbo) branch 3.3 updated: Bump com.alibaba:fastjson from 1.2.83 to 1.2.83_noneautotype (#14751)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 97bae23ab2 Bump com.alibaba:fastjson from 1.2.83 to 1.2.83_noneautotype (#14751) 97bae23ab2 is described below commit 97bae23ab2d416a9f229852402eb6f5af3dacfdc Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Oct 7 16:40:21 2024 +0800 Bump com.alibaba:fastjson from 1.2.83 to 1.2.83_noneautotype (#14751) Bumps [com.alibaba:fastjson](https://github.com/alibaba/fastjson) from 1.2.83 to 1.2.83_noneautotype. - [Release notes](https://github.com/alibaba/fastjson/releases) - [Commits](https://github.com/alibaba/fastjson/commits) --- updated-dependencies: - dependency-name: com.alibaba:fastjson dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 5552c6b480..46671ed606 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -98,7 +98,7 @@ 0.0.28.Final 4.5.14 4.4.16 -1.2.83 +1.2.83_noneautotype 2.0.53 3.7.2 5.7.0
(dubbo) branch 3.3 updated: Bump io.opentelemetry:opentelemetry-bom from 1.42.0 to 1.42.1 (#14737)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 6661d64cb0 Bump io.opentelemetry:opentelemetry-bom from 1.42.0 to 1.42.1 (#14737) 6661d64cb0 is described below commit 6661d64cb013b34880bf1cd55f32892f846e6af4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Oct 4 23:49:50 2024 +0800 Bump io.opentelemetry:opentelemetry-bom from 1.42.0 to 1.42.1 (#14737) Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.42.0 to 1.42.1. - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.42.0...v1.42.1) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index c4ebf46a99..409c78c30a 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -45,7 +45,7 @@ 4.11.0 1.13.4 1.3.4 -1.42.0 +1.42.1 3.4.2 0.16.0
svn commit: r72053 - in /dev/dubbo/dubbo/3.3.1: ./ apache-dubbo-3.3.1.zip apache-dubbo-3.3.1.zip.asc apache-dubbo-3.3.1.zip.sha512
Author: albumenj Date: Thu Oct 3 04:37:11 2024 New Revision: 72053 Log: Release Apache Dubbo 3.3.1 RC1 Added: dev/dubbo/dubbo/3.3.1/ dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip (with props) dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.asc dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.sha512 Added: dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.asc == --- dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.asc (added) +++ dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.asc Thu Oct 3 04:37:11 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEFcfFqQs6t3A0GIYZEkta3Ssknt0FAmb+H08ACgkQEkta3Ssk +nt3KKg//VLilxl81RWpgVPtXDJeKoZvRQqfe40VTtQ4NEYVsyaZ26zJ96rMwIRxW +A7v/PK86NEoRyZbeY/+1Qy4Kl9JZvgdQiwvG/7BHQ/evJ20zsdZm4/TvsNK5JL+Y +9KCPDLN+U7LWJfVypOPt0ZyBxYqgHDlv55QEP+vbtewxbvW0dRciASlbW0F/ty/g +BNEMiDW6C3qpf8HYbxoyq3KWNLbkhmx02Z9xwEMiGhQ5S0+AqzPAd4HtSgSE4Ie7 +iCGzNAfDdnTVnd5xXJYI47GhXa/99N7IJyIAA7tPkqrA18+UMcWBGSkb89GeB66Z +uRo9TwiX5ubKOwMtylXSTjAK9ByW8S3tuU53w8unuqYn7+KHZfpsEo2uaqYbjEd0 +pwlHl49UxNAKXNXN7riHZSZZg1MdlDIbCzBnH5+Nc7BWrjvMvuleAqfq/BZ2aDEY +b1JAERpNFvNgLuxSJQ4wCm9fssGUepm/xhR1PXD4l7SSRaiKvputpwqK5NUO/FXn +mfHpsb8AgFVl+lfkmBMLHsYGRrZAsWPF/e58z7c8XsiPG0CJqWfw1BQoh5eboqxL +SIYdQJDmvkZNJKZ/YHSbPoc3AeSae//c/U10wc6osnTA2tff38Si7e/Uum5z+geS +42mGpAMrWY2BkeUn89jW64yTNHsPA9VpUj3tzDvGu4ti6+oCZto= +=9vID +-END PGP SIGNATURE- Added: dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.sha512 == --- dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.sha512 (added) +++ dev/dubbo/dubbo/3.3.1/apache-dubbo-3.3.1.zip.sha512 Thu Oct 3 04:37:11 2024 @@ -0,0 +1 @@ +2ed096c19b0bc92bd0f7bd431b7c90177d83feeba9881b5ebe5f5ab2d0adb3c5bf7d4799c34b354206ffe84f9bc321f204b6cb7bca5a4daea9f68a85888e30e7 apache-dubbo-3.3.1.zip
(dubbo) tag dubbo-3.3.1 created (now 8a01c60ac5)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to tag dubbo-3.3.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git at 8a01c60ac5 (commit) No new revisions were added by this update.
(dubbo) 01/01: Prepare 3.3.1 release
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3.1-release in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 8a01c60ac577e0f1defb52d0ee1031347bf7b4a5 Author: Albumen Kevin AuthorDate: Wed Oct 2 13:13:25 2024 +0800 Prepare 3.3.1 release --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-plugin/dubbo-rest-jaxrs/pom.xml| 2 +- dubbo-plugin/dubbo-rest-spring/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 5552c6b480..023fb5d51f 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -187,7 +187,7 @@ 4.0.2 2.4.0-b180830.0438 -3.3.1-SNAPSHOT +3.3.1 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index b45047ba0e..a0567d21d8 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -39,7 +39,7 @@ 1.0.0 2.38.0 -3.3.1-SNAPSHOT +3.3.1 diff --git a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml index fd967b07ec..67cf46dd3b 100644 --- a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml +++ b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml @@ -104,7 +104,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.1-SNAPSHOT + 3.3.1 test diff --git a/dubbo-plugin/dubbo-rest-spring/pom.xml b/dubbo-plugin/dubbo-rest-spring/pom.xml index 671cc8bd28..2a89157d94 100644 --- a/dubbo-plugin/dubbo-rest-spring/pom.xml +++ b/dubbo-plugin/dubbo-rest-spring/pom.xml @@ -113,7 +113,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.1-SNAPSHOT + 3.3.1 test diff --git a/pom.xml b/pom.xml index fba114a047..de6c1fceef 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ check 1.0.0 2.38.0 -3.3.1-SNAPSHOT +3.3.1
(dubbo) branch 3.3.1-release created (now 8a01c60ac5)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.3.1-release in repository https://gitbox.apache.org/repos/asf/dubbo.git at 8a01c60ac5 Prepare 3.3.1 release This branch includes the following new commits: new 8a01c60ac5 Prepare 3.3.1 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.
(dubbo-integration-cases) branch main updated: Bump com.google.protobuf:protobuf-java (#45)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git The following commit(s) were added to refs/heads/main by this push: new 2832926e Bump com.google.protobuf:protobuf-java (#45) 2832926e is described below commit 2832926e03e7f86975bbd1e5897aa11902bc0ed6 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Oct 2 10:49:23 2024 +0800 Bump com.google.protobuf:protobuf-java (#45) Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.19.6 to 3.25.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.19.6...v3.25.5) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 99-integration/dubbo-samples-test-13436-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-13436-2/pom.xml b/99-integration/dubbo-samples-test-13436-2/pom.xml index 08e437d8..86ed2d1c 100644 --- a/99-integration/dubbo-samples-test-13436-2/pom.xml +++ b/99-integration/dubbo-samples-test-13436-2/pom.xml @@ -43,7 +43,7 @@ 4.13.1 3.7.0 -3.19.6 +3.25.5
(dubbo) branch 3.3 updated: Fix memory leak in HttpPostRequestDecoder (#14741)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new b9a2f194f0 Fix memory leak in HttpPostRequestDecoder (#14741)
b9a2f194f0 is described below
commit b9a2f194f044c07532715e212ab2e72155be9bad
Author: Sean Yang
AuthorDate: Wed Oct 2 10:16:24 2024 +0800
Fix memory leak in HttpPostRequestDecoder (#14741)
---
.../java/org/apache/dubbo/remoting/http12/HttpUtils.java | 12 +++-
.../tri/h12/AbstractServerTransportListener.java | 16 +++-
.../tri/rest/support/basic/RestProtocolTest.groovy | 14 ++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpUtils.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpUtils.java
index 22e16fb20f..488242d921 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpUtils.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpUtils.java
@@ -29,8 +29,11 @@ import java.util.List;
import java.util.Locale;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.handler.codec.http.DefaultFullHttpRequest;
import io.netty.handler.codec.http.DefaultHttpHeaders;
import io.netty.handler.codec.http.HttpHeaders;
@@ -51,6 +54,7 @@ import
io.netty.handler.codec.http.multipart.InterfaceHttpData;
public final class HttpUtils {
+public static final ByteBufAllocator HEAP_ALLOC = new
UnpooledByteBufAllocator(false, false);
public static final HttpDataFactory DATA_FACTORY = new
DefaultHttpDataFactory(DefaultHttpDataFactory.MINSIZE);
public static final String CHARSET_PREFIX = "charset=";
@@ -164,7 +168,13 @@ public final class HttpUtils {
if (canMark) {
inputStream.mark(Integer.MAX_VALUE);
}
-data = Unpooled.wrappedBuffer(StreamUtils.readBytes(inputStream));
+if (inputStream.available() == 0) {
+data = Unpooled.EMPTY_BUFFER;
+} else {
+data = HEAP_ALLOC.buffer();
+ByteBufOutputStream os = new ByteBufOutputStream(data);
+StreamUtils.copy(inputStream, os);
+}
} catch (IOException e) {
throw new DecodeException("Error while reading post data: " +
e.getMessage(), e);
} finally {
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
index 871b9aa46b..a6944a3510 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
@@ -23,6 +23,7 @@ import org.apache.dubbo.common.logger.FluentLogger;
import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
import org.apache.dubbo.common.threadpool.serial.SerializingExecutor;
import org.apache.dubbo.common.utils.MethodUtils;
+import org.apache.dubbo.common.utils.UrlUtils;
import org.apache.dubbo.remoting.http12.HttpChannel;
import org.apache.dubbo.remoting.http12.HttpInputMessage;
import org.apache.dubbo.remoting.http12.HttpStatus;
@@ -278,14 +279,27 @@ public abstract class
AbstractServerTransportListener f.invoke(invoker, inv));
+HeaderFilter[] headerFilters =
+UrlUtils.computeServiceAttribute(invoker.getUrl(),
HEADER_FILTERS_CACHE, this::loadHeaderFilters);
+for (HeaderFilter headerFilter : headerFilters) {
+headerFilter.invoke(invoker, inv);
+}
initializeAltSvc(url);
return onBuildRpcInvocationCompletion(inv);
}
+private HeaderFilter[] loadHeaderFilters(URL url) {
+List headerFilters = frameworkModel
+.getExtensionLoader(HeaderFilter.class)
+.getActivateExtension(url, CommonConstants.HEADER_FILTER_KEY);
+LOGGER.info("Header filters for [{}] loaded: {}", url, headerFilters);
+return headerFilters.toArray(new HeaderFilter[0]);
+}
+
protected RpcInvocation onBuildRpcInvocationCompletion(RpcInvocation
invocation) {
String timeoutString =
httpMetadata.header(TripleHeaderEnum.SERVICE_TIMEOUT.getKey());
try {
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/test/groovy/org/apac
(dubbo-integration-cases) branch main updated: Bump com.google.protobuf:protobuf-java (#44)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git The following commit(s) were added to refs/heads/main by this push: new 4c4df8bd Bump com.google.protobuf:protobuf-java (#44) 4c4df8bd is described below commit 4c4df8bd0f464fec678a45a3854047f762ff1d0e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Oct 2 09:55:21 2024 +0800 Bump com.google.protobuf:protobuf-java (#44) Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.22.2 to 3.25.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.22.2...v3.25.5) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 99-integration/dubbo-samples-test-13078/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-13078/pom.xml b/99-integration/dubbo-samples-test-13078/pom.xml index 2c7ac926..38c513d4 100644 --- a/99-integration/dubbo-samples-test-13078/pom.xml +++ b/99-integration/dubbo-samples-test-13078/pom.xml @@ -85,7 +85,7 @@ com.google.protobuf protobuf-java -3.22.2 +3.25.5
(dubbo) branch 3.3 updated: feat(actuator):Adding Support for Spring Boot Actuator (#14596)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 6982695af2 feat(actuator):Adding Support for Spring Boot Actuator
(#14596)
6982695af2 is described below
commit 6982695af2b25553562806877f7c08eb381401fb
Author: JinQian <62689834+jinqian1...@users.noreply.github.com>
AuthorDate: Wed Oct 2 09:53:00 2024 +0800
feat(actuator):Adding Support for Spring Boot Actuator (#14596)
* feat(dubbo-actuator):add actuator
* fix:Illegal logger method invocations
* fix:add automatically generate properties,simplify the invoke
process,fixed an error where Class name duplicate DubboEndpoint in
dubbo-spring-boot-compatible
* fix:Actuator offline and gracefulshutdown operations are disabled by
default
* fix:Only enable live, ready and startup by default
* fix:Remove development comments
* fix:Remove automatically generate properties feature
* fix:Change the configuration format
* fix:Set endpoint enablement to be opt-in rather than opt-out, modify
README.md
---
.../apache/dubbo/qos/QosScopeModelInitializer.java | 6 +-
.../dubbo/qos/command/ActuatorCommandExecutor.java | 63 +++
.../apache/dubbo/qos/command/ActuatorExecutor.java | 27 +
.../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-compatible/actuator/pom.xml | 7 ++
.../DubboExtensionEndpointAutoConfiguration.java | 38 +++
.../configuration/DubboActuatorProperties.java}| 42
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
14 files changed, 310 insertions(+), 69 deletions(-)
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
index 58125556ba..cf2679c36a 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/QosScopeModelInitializer.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.qos;
import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
+import org.apache.dubbo.qos.command.ActuatorCommandExecutor;
import org.apache.dubbo.qos.command.util.SerializeCheckUtils;
import org.apache.dubbo.qos.server.Server;
import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -33,7 +34,10 @@ public class QosScopeModelInitializer implements
ScopeModelInitializer {
}
@Override
-public void initializeApplicationModel(ApplicationModel applicationModel)
{}
+public void initializeApplicationModel(ApplicationModel applicationModel) {
+ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
+beanFactory.registerBean(ActuatorCommandExecutor.class);
+}
@Override
public void initializeModuleModel(ModuleModel moduleModel) {}
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/ActuatorCommandExecutor.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/ActuatorCommandExecutor.java
new file mode 100644
index 00..7073eea124
--- /dev/null
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/ActuatorCommandExecutor.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.qos.command;
+
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.qos.api.BaseCommand;
+import org.apache.dubbo.qos.api.CommandContext;
+import org.apache.dubbo.rpc.model.ApplicationMode
(dubbo) branch 3.3 updated (175b108be4 -> 93fa6c3ebd)
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 175b108be4 Bump jackson_version from 2.17.2 to 2.18.0 (#14738) add 93fa6c3ebd Bump io.micrometer:micrometer-tracing-bom from 1.3.3 to 1.3.4 (#14739) No new revisions were added by this update. Summary of changes: dubbo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated: Bump jackson_version from 2.17.2 to 2.18.0 (#14738)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 175b108be4 Bump jackson_version from 2.17.2 to 2.18.0 (#14738) 175b108be4 is described below commit 175b108be4e7d15d935daa38f1a472059fb261d9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Oct 2 09:51:42 2024 +0800 Bump jackson_version from 2.17.2 to 2.18.0 (#14738) Bumps `jackson_version` from 2.17.2 to 2.18.0. Updates `com.fasterxml.jackson.core:jackson-core` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.17.2...jackson-core-2.18.0) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.17.2 to 2.18.0 Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.17.2 to 2.18.0 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 950e753c70..5552c6b480 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -174,7 +174,7 @@ 5.4.3 2.0.6 2.11.0 -2.17.2 +2.18.0 6.1.26 2.0 1.6.0
(dubbo) branch 3.3 updated (e15b8ff2d8 -> fe03ff5a8f)
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 e15b8ff2d8 Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14734) add fe03ff5a8f Bump log4j2_version from 2.24.0 to 2.24.1 (#14735) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated (fe03ff5a8f -> fa333e2dd2)
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 fe03ff5a8f Bump log4j2_version from 2.24.0 to 2.24.1 (#14735) add fa333e2dd2 Bump byte-buddy_version from 1.15.1 to 1.15.3 (#14736) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated (a13f17f597 -> e15b8ff2d8)
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 a13f17f597 Merge branch 'refs/heads/apache-3.2' into apache-3.3 add e15b8ff2d8 Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14734) No new revisions were added by this update. Summary of changes: dubbo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch dependabot/maven/junit_jupiter_version-5.11.1 updated (0c317eb6ef -> 3a397eabbd)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch dependabot/maven/junit_jupiter_version-5.11.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 0c317eb6ef Fix junit test failed add 3a397eabbd Fix junit test failed No new revisions were added by this update. Summary of changes: dubbo-rpc/dubbo-rpc-triple/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch dependabot/maven/junit_jupiter_version-5.11.1 updated (0ad12fdbc4 -> 0c317eb6ef)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch dependabot/maven/junit_jupiter_version-5.11.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 0ad12fdbc4 Bump junit_jupiter_version from 5.9.3 to 5.11.1 add 0c317eb6ef Fix junit test failed No new revisions were added by this update. Summary of changes: dubbo-rpc/dubbo-rpc-triple/pom.xml | 6 ++ dubbo-test/dubbo-test-check/pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
(dubbo) branch 3.2 updated (6ec002d709 -> 71af8accab)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 6ec002d709 bugfix: application/x-www-form-urlencoded There is a problem with parameter parsing (#14700) add 71af8accab Disable check when create MetadataService invoker to prevent memory leak (#14732) No new revisions were added by this update. Summary of changes: .../java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java | 2 ++ 1 file changed, 2 insertions(+)
(dubbo) branch 3.4 created (now adb5399580)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.4 in repository https://gitbox.apache.org/repos/asf/dubbo.git at adb5399580 Bump version to 3.4.0-beta.1-SNAPSHOT This branch includes the following new commits: new adb5399580 Bump version to 3.4.0-beta.1-SNAPSHOT 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.
(dubbo) branch 3.3 updated (12255455c1 -> a13f17f597)
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 12255455c1 Implement Destroyable in MetadataServiceV2 (#14731) add 6ec002d709 bugfix: application/x-www-form-urlencoded There is a problem with parameter parsing (#14700) add 71af8accab Disable check when create MetadataService invoker to prevent memory leak (#14732) add a13f17f597 Merge branch 'refs/heads/apache-3.2' into apache-3.3 No new revisions were added by this update. Summary of changes: .../java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java | 2 ++ 1 file changed, 2 insertions(+)
(dubbo) 01/01: Bump version to 3.4.0-beta.1-SNAPSHOT
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 adb53995808490dace1b7e326e026fd6a2eb4984 Author: Albumen Kevin AuthorDate: Sun Sep 29 14:18:59 2024 +0800 Bump version to 3.4.0-beta.1-SNAPSHOT --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-plugin/dubbo-rest-jaxrs/pom.xml| 2 +- dubbo-plugin/dubbo-rest-spring/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 910b8ac61a..8709a5d3e8 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -187,7 +187,7 @@ 4.0.1 2.3.3-b02 -3.3.1-SNAPSHOT +3.4.0-beta.1-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index b45047ba0e..f927d7a0d5 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -39,7 +39,7 @@ 1.0.0 2.38.0 -3.3.1-SNAPSHOT +3.4.0-beta.1-SNAPSHOT diff --git a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml index fd967b07ec..2ff20fa4bc 100644 --- a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml +++ b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml @@ -104,7 +104,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.1-SNAPSHOT + 3.4.0-beta.1-SNAPSHOT test diff --git a/dubbo-plugin/dubbo-rest-spring/pom.xml b/dubbo-plugin/dubbo-rest-spring/pom.xml index 671cc8bd28..0dacef4345 100644 --- a/dubbo-plugin/dubbo-rest-spring/pom.xml +++ b/dubbo-plugin/dubbo-rest-spring/pom.xml @@ -113,7 +113,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.1-SNAPSHOT + 3.4.0-beta.1-SNAPSHOT test diff --git a/pom.xml b/pom.xml index fba114a047..8f6d06a1e0 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ check 1.0.0 2.38.0 -3.3.1-SNAPSHOT +3.4.0-beta.1-SNAPSHOT
(dubbo) branch 3.3 updated (6c6056ac91 -> b2eba829d3)
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 6c6056ac91 Move observability autoconfigure to dubbo-spring-boot-autoconfigure (#14705) add b2eba829d3 Added support for configuring Tomcat HTTP2 max stream size in Spring boot (#14702) No new revisions were added by this update. Summary of changes: .../apache/dubbo/config/nested/ServletConfig.java | 16 ++ .../dubbo-spring-boot-3-autoconfigure/pom.xml | 7 +- .../DubboTriple3AutoConfiguration.java | 25 +- .../dubbo-spring-boot-autoconfigure/pom.xml| 5 + .../DubboTripleAutoConfiguration.java | 25 +- 5 files changed, 75 insertions(+), 3 deletions(-)
(dubbo) branch 3.3 updated (86c1a9db17 -> 12255455c1)
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 86c1a9db17 Fix safeLock not run when interrupt & Fix partial notification being cancelled in ServiceInstancesChangedListener (#14730) add 12255455c1 Implement Destroyable in MetadataServiceV2 (#14731) No new revisions were added by this update. Summary of changes: .../org/apache/dubbo/metadata/DubboMetadataServiceV2Triple.java | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
(dubbo) branch 3.3 updated (b2eba829d3 -> 86c1a9db17)
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 b2eba829d3 Added support for configuring Tomcat HTTP2 max stream size in Spring boot (#14702) add 86c1a9db17 Fix safeLock not run when interrupt & Fix partial notification being cancelled in ServiceInstancesChangedListener (#14730) No new revisions were added by this update. Summary of changes: .../org/apache/dubbo/common/utils/LockUtils.java | 26 ++- .../apache/dubbo/common/utils/LockUtilsTest.java | 22 +- .../listener/ServiceInstancesChangedListener.java | 50 -- 3 files changed, 65 insertions(+), 33 deletions(-)
(dubbo) branch 3.3 updated: Move observability autoconfigure to dubbo-spring-boot-autoconfigure (#14705)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 6c6056ac91 Move observability autoconfigure to
dubbo-spring-boot-autoconfigure (#14705)
6c6056ac91 is described below
commit 6c6056ac919a41ebd5213dc3bd03039a6ed8f18e
Author: Jermaine Hua
AuthorDate: Sun Sep 29 10:09:10 2024 +0800
Move observability autoconfigure to dubbo-spring-boot-autoconfigure (#14705)
* Move observability autoconfigure to dubbo-spring-boot-autoconfigure
Signed-off-by: “JermaineHua”
* Revert demo
Signed-off-by: “JermaineHua”
-
Signed-off-by: “JermaineHua”
---
.artifacts | 1 -
dubbo-distribution/dubbo-bom/pom.xml | 5 -
.../dubbo-spring-boot-autoconfigure/pom.xml| 105 ++
.../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 +-
.../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 -
33 files changed, 234 insertions(+), 330 deletions(-)
diff --git a/.artifacts b/.artifacts
index 92f7a1615c..e0d680cc6a 100644
--- a/.artifacts
+++ b/.artifacts
@@ -96,7 +96,6 @@ dubbo-spring-boot-3-autoconfigure
dubbo-spring-boot-autoconfigure-compatible
dubbo-spring-boot-compatible
dubbo-observability-spring-boot-starters
-dubbo-observability-spring-boot-autoconfigure
dubbo-tracing-brave-zipkin-spring-boot-starter
dubbo-tracing-otel-zipkin-spring-boot-starter
dubbo-tracing-otel-otlp-spring-boot-starter
diff --git a/dubbo-distribution/dubbo-bom/pom.xml
b/dubbo-distribution/dubbo-bom/pom.xml
index 4a0a8cc29d..0791ada4c2 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -523,11 +523,6 @@
${project.version}
pom
-
-org.apache.dubbo
-dubbo-observability-spring-boot-autoconfigure
-${project.version}
-
org.apache.dubbo
dubbo-tracing-otel-zipkin-spring-boot-starter
diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
index 4d85060d46..7e3b19cb4e 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
@@ -84,6 +84,111 @@
provided
+
+
+ io.micrometer
+ micrometer-tracing
+ provided
+
+
+ io.micrometer
+ micrometer-observation
+ provided
+
+
+ io.micrometer
+ micrometer-core
+ provided
+
+
+ io.micrometer
+ micrometer-registry-prometheus-simpleclient
+ provided
+
+
+ io.micrometer
+ micrometer-core
+
+
+
+
+ com.tdunning
+ t-digest
+ provided
+
+
+
+
+ io.prometheus
+ simpleclient
+ provided
+
+
+ io.prometheus
+ simpleclient_pushgateway
+ provided
+
+
+
+ org.springframework
+ spring-webmvc
+ true
+
+
+ org.springframework
+ spring-webflux
+ true
(dubbo-integration-cases) branch main updated: Bump com.google.protobuf:protobuf-java (#43)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git The following commit(s) were added to refs/heads/main by this push: new 726e8f74 Bump com.google.protobuf:protobuf-java (#43) 726e8f74 is described below commit 726e8f7465f3e475f7d707b8e4cd4d4dcdc88194 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Sep 29 10:07:20 2024 +0800 Bump com.google.protobuf:protobuf-java (#43) Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.22.2 to 3.25.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.22.2...v3.25.5) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 99-integration/dubbo-samples-test-13580/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-13580/pom.xml b/99-integration/dubbo-samples-test-13580/pom.xml index a29b152b..10b3c567 100644 --- a/99-integration/dubbo-samples-test-13580/pom.xml +++ b/99-integration/dubbo-samples-test-13580/pom.xml @@ -131,7 +131,7 @@ com.google.protobuf protobuf-java -3.22.2 +3.25.5
(dubbo) branch 3.3 updated: Http2 sse support (#14673)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new c23af2487d Http2 sse support (#14673)
c23af2487d is described below
commit c23af2487d5cdead0b543bda6bbd11e7ce2933b4
Author: Sean Yang
AuthorDate: Sun Sep 29 10:07:11 2024 +0800
Http2 sse support (#14673)
---
.../dubbo/remoting/http12/HttpConstants.java | 7 ++
.../dubbo/remoting/http12/HttpHeaderNames.java | 2 ++
.../apache/dubbo/remoting/http12/HttpMetadata.java | 5 +
...ver.java => Http1SseServerChannelObserver.java} | 19 ++--
.../remoting/http12/message/codec/JsonPbCodec.java | 3 ++-
.../h2/NettyHttp2ProtocolSelectorHandler.java | 5 +
.../main/java/org/apache/dubbo/rpc/Constants.java | 1 -
.../DefaultHttp11ServerTransportListener.java | 8 +++
.../h12/http1/Http1UnaryServerChannelObserver.java | 2 +-
.../http2/GenericHttp2ServerTransportListener.java | 9 ++--
.../h12/http2/Http2SseServerChannelObserver.java | 25 +-
.../dubbo/rpc/protocol/tri/test/TestResponse.java | 9 ++--
.../rpc/protocol/tri/test/TestRunnerImpl.java | 2 +-
13 files changed, 54 insertions(+), 43 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpConstants.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpConstants.java
index a45e8fe396..ef6995b857 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpConstants.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpConstants.java
@@ -16,12 +16,16 @@
*/
package org.apache.dubbo.remoting.http12;
+import java.nio.charset.StandardCharsets;
+
public final class HttpConstants {
public static final String TRAILERS = "trailers";
public static final String CHUNKED = "chunked";
+public static final String NO_CACHE = "no-cache";
+
public static final String X_FORWARDED_PROTO = "x-forwarded-proto";
public static final String X_FORWARDED_HOST = "x-forwarded-host";
public static final String X_FORWARDED_PORT = "x-forwarded-port";
@@ -29,5 +33,8 @@ public final class HttpConstants {
public static final String HTTPS = "https";
public static final String HTTP = "http";
+public static final byte[] SERVER_SENT_EVENT_DATA_PREFIX_BYTES =
"data:".getBytes(StandardCharsets.US_ASCII);
+public static final byte[] SERVER_SENT_EVENT_LF_BYTES =
"\n\n".getBytes(StandardCharsets.US_ASCII);
+
private HttpConstants() {}
}
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpHeaderNames.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpHeaderNames.java
index 0abfb8658f..5272913d3e 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpHeaderNames.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpHeaderNames.java
@@ -34,6 +34,8 @@ public enum HttpHeaderNames {
TRANSFER_ENCODING(io.netty.handler.codec.http.HttpHeaderNames.TRANSFER_ENCODING),
+CACHE_CONTROL(io.netty.handler.codec.http.HttpHeaderNames.CACHE_CONTROL),
+
LOCATION(io.netty.handler.codec.http.HttpHeaderNames.LOCATION),
HOST(io.netty.handler.codec.http.HttpHeaderNames.HOST),
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpMetadata.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpMetadata.java
index acf8a5d171..48cdf45633 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpMetadata.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpMetadata.java
@@ -27,4 +27,9 @@ public interface HttpMetadata {
default String header(CharSequence name) {
return headers().getFirst(name);
}
+
+default HttpMetadata header(CharSequence name, String value) {
+headers().set(name, value);
+return this;
+}
}
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/Http1ServerStreamChannelObserver.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/Http1SseServerChannelObserver.java
similarity index 68%
copy from
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/Http1ServerStreamChannelObserver.java
copy to
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting
(dubbo) branch 3.3 updated: Fix triple client connection shareing race condition (#14718)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new e1cfc037eb Fix triple client connection shareing race condition
(#14718)
e1cfc037eb is described below
commit e1cfc037ebdc38f421e0bc2abde56b0c0abeabd1
Author: Ken Liu
AuthorDate: Fri Sep 27 17:30:35 2024 +0800
Fix triple client connection shareing race condition (#14718)
* fix triple client connection management issue, #14717, #14716
* fix triple client connection management issue, #14717, #14716
* add comment
* polish warning log format
* polish warning log format
* Make stub implement Destroyable
* format code
---
.../src/main/resources/Dubbo3TripleStub.mustache | 8 -
.../api/connection/AbstractConnectionClient.java | 11 +--
.../SingleProtocolConnectionManager.java | 34 +-
3 files changed, 41 insertions(+), 12 deletions(-)
diff --git
a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache
b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache
index 525eb8d634..6f19d17fb1 100644
--- a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache
+++ b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache
@@ -30,6 +30,7 @@ import org.apache.dubbo.rpc.model.MethodDescriptor;
import org.apache.dubbo.rpc.model.ServiceDescriptor;
import org.apache.dubbo.rpc.model.StubMethodDescriptor;
import org.apache.dubbo.rpc.model.StubServiceDescriptor;
+import org.apache.dubbo.rpc.service.Destroyable;
import org.apache.dubbo.rpc.stub.BiStreamMethodHandler;
import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler;
import org.apache.dubbo.rpc.stub.StubInvocationUtil;
@@ -130,13 +131,18 @@ public final class {{className}} {
{{/biStreamingWithoutClientStreamMethods}}
}
-public static class {{interfaceClassName}}Stub implements
{{interfaceClassName}}{
+public static class {{interfaceClassName}}Stub implements
{{interfaceClassName}}, Destroyable {
private final Invoker<{{interfaceClassName}}> invoker;
public {{interfaceClassName}}Stub(Invoker<{{interfaceClassName}}>
invoker) {
this.invoker = invoker;
}
+@Override
+public void $destroy() {
+ invoker.destroy();
+ }
+
{{#unaryMethods}}
{{#javaDoc}}
{{{javaDoc}}}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/AbstractConnectionClient.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/AbstractConnectionClient.java
index 80aa710a28..2fea60ce9d 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/AbstractConnectionClient.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/AbstractConnectionClient.java
@@ -61,13 +61,17 @@ public abstract class AbstractConnectionClient extends
AbstractClient {
/**
* Increments the reference count by 1.
*/
-public final AbstractConnectionClient retain() {
+public final boolean retain() {
long oldCount = COUNTER_UPDATER.getAndIncrement(this);
if (oldCount <= 0) {
COUNTER_UPDATER.getAndDecrement(this);
-throw new AssertionError("This instance has been destroyed");
+logger.info(
+"Retain failed, because connection " + remote
++ " has been destroyed but not yet removed, will
create a new one instead."
++ " Check logs below to confirm that this
connection finally gets removed to make sure there's no potential memory
leak!");
+return false;
}
-return this;
+return true;
}
/**
@@ -77,6 +81,7 @@ public abstract class AbstractConnectionClient extends
AbstractClient {
long remainingCount = COUNTER_UPDATER.decrementAndGet(this);
if (remainingCount == 0) {
+logger.info("Destroying connection to {}, because the reference
count reaches 0", remote);
destroy();
return true;
} else if (remainingCount <= -1) {
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/SingleProtocolConnectionManager.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/SingleProtocolConnectionManager.java
index 3f84069671..10f002df61 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/connection/SingleProtocolConnectionManager.java
+++
b/dubbo-remoting/
(dubbo) branch 3.3 updated (fd8872492b -> 5c011bea69)
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 fd8872492b Bump commons-codec:commons-codec from 1.16.0 to 1.17.1 (#14711) add 5c011bea69 Bump io.opentelemetry:opentelemetry-bom from 1.42.0 to 1.42.1 (#14676) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(dubbo) branch 3.3 updated: Bump commons-codec:commons-codec from 1.16.0 to 1.17.1 (#14711)
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 The following commit(s) were added to refs/heads/3.3 by this push: new fd8872492b Bump commons-codec:commons-codec from 1.16.0 to 1.17.1 (#14711) fd8872492b is described below commit fd8872492b42f7537ba50499136fa536c748ff88 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 17:07:07 2024 +0800 Bump commons-codec:commons-codec from 1.16.0 to 1.17.1 (#14711) Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.16.0 to 1.17.1. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.16.0...rel/commons-codec-1.17.1) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 657d3b16d7..5a78a2bca6 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -150,7 +150,7 @@ 2.24.0 2.17.0 -1.16.0 +1.17.1 4.0.23
(dubbo-integration-cases) branch main updated: Bump com.google.protobuf:protobuf-java (#42)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git The following commit(s) were added to refs/heads/main by this push: new 2b66ca66 Bump com.google.protobuf:protobuf-java (#42) 2b66ca66 is described below commit 2b66ca66dd403adc91b9f3c3fa943c189f16412c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 16:59:54 2024 +0800 Bump com.google.protobuf:protobuf-java (#42) Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.19.6 to 3.25.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.19.6...v3.25.5) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 99-integration/dubbo-samples-test-13436-4/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-13436-4/pom.xml b/99-integration/dubbo-samples-test-13436-4/pom.xml index f80bf04d..09913acb 100644 --- a/99-integration/dubbo-samples-test-13436-4/pom.xml +++ b/99-integration/dubbo-samples-test-13436-4/pom.xml @@ -43,7 +43,7 @@ 4.13.1 3.7.0 -3.19.6 +3.25.5
(dubbo) branch 3.3 updated: Bump io.micrometer:micrometer-core from 1.13.3 to 1.13.4 (#14679)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 46bab2a9e3 Bump io.micrometer:micrometer-core from 1.13.3 to 1.13.4 (#14679) 46bab2a9e3 is described below commit 46bab2a9e3f8f464ef34e8adbe336702b50aed4b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 16:40:43 2024 +0800 Bump io.micrometer:micrometer-core from 1.13.3 to 1.13.4 (#14679) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml index 77b5c8d659..8667c4b6c5 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@ -36,7 +36,7 @@ true 2.7.18 2.7.18 -1.13.3 +1.13.4
(dubbo) branch 3.3 updated (c1512b6d3c -> 683ca80916)
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 c1512b6d3c Bump org.awaitility:awaitility from 4.2.0 to 4.2.2 (#14708) add 683ca80916 Bump grpc.version from 1.66.0 to 1.68.0 (#14706) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated (a397fa3970 -> 88d789ac8c)
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 a397fa3970 Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#14713) add 88d789ac8c Bump curator5_version from 4.2.0 to 5.7.0 (#14712) No new revisions were added by this update. Summary of changes: dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(dubbo) branch 3.3 updated: Returns a matching http status code based on the rest mappings (#14714)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 70f6e03636 Returns a matching http status code based on the rest
mappings (#14714)
70f6e03636 is described below
commit 70f6e036363ac5f66e13dbf706c41287bc34ac73
Author: Sean Yang
AuthorDate: Fri Sep 27 16:14:57 2024 +0800
Returns a matching http status code based on the rest mappings (#14714)
---
.../mapping/DefaultRequestMappingRegistry.java | 56 --
.../protocol/tri/rest/mapping/RequestMapping.java | 16 +--
.../tri/rest/support/basic/RestProtocolTest.groovy | 22 -
.../rpc/protocol/tri/rest/service/DemoService.java | 4 ++
.../protocol/tri/rest/service/DemoServiceImpl.java | 5 ++
5 files changed, 93 insertions(+), 10 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
index f219b85403..8ec6bf4716 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.nested.RestConfig;
import org.apache.dubbo.remoting.http12.HttpRequest;
+import org.apache.dubbo.remoting.http12.exception.HttpStatusException;
import org.apache.dubbo.remoting.http12.message.MethodMetadata;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.model.FrameworkModel;
@@ -45,6 +46,7 @@ import org.apache.dubbo.rpc.protocol.tri.rest.util.PathUtils;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -205,7 +207,8 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
KeyString path = new KeyString(stringPath,
restConfig.getCaseSensitiveMatchOrDefault());
List candidates = new ArrayList<>();
-tryMatch(request, path, candidates);
+List partialMatches = new LinkedList<>();
+tryMatch(request, path, candidates, partialMatches);
if (candidates.isEmpty()) {
int end = path.length();
@@ -213,7 +216,7 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
if (restConfig.getTrailingSlashMatchOrDefault()) {
if (path.charAt(end - 1) == '/') {
end--;
-tryMatch(request, path.subSequence(0, end), candidates);
+tryMatch(request, path.subSequence(0, end), candidates,
partialMatches);
}
}
@@ -225,7 +228,7 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
}
if (ch == '.' &&
restConfig.getSuffixPatternMatchOrDefault()) {
if (contentNegotiator.supportExtension(path.toString(i
+ 1, end))) {
-tryMatch(request, path.subSequence(0, i),
candidates);
+tryMatch(request, path.subSequence(0, i),
candidates, partialMatches);
if (!candidates.isEmpty()) {
break;
}
@@ -234,7 +237,7 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
}
if (ch == '~') {
request.setAttribute(RestConstants.SIG_ATTRIBUTE,
path.toString(i + 1, end));
-tryMatch(request, path.subSequence(0, i), candidates);
+tryMatch(request, path.subSequence(0, i), candidates,
partialMatches);
if (!candidates.isEmpty()) {
break;
}
@@ -245,6 +248,7 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
int size = candidates.size();
if (size == 0) {
+handleNoMatch(request, partialMatches);
return null;
}
if (size > 1) {
@@ -289,7 +293,8 @@ public final class DefaultRequestMappingRegistry implements
RequestMappingRegist
return handler;
}
-private void tryMatch(HttpRequest request, KeyString path, List
candidates) {
+private void tryMatch(
+HttpRequest request, KeyString path, List candidates,
(dubbo) branch 3.3 updated: Support configuration of disallowed content-types (#14726)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 957db22353 Support configuration of disallowed content-types (#14726)
957db22353 is described below
commit 957db22353bec1660ce09781c7fbb0d7f86c0c5c
Author: Sean Yang
AuthorDate: Fri Sep 27 16:14:35 2024 +0800
Support configuration of disallowed content-types (#14726)
---
.../org/apache/dubbo/config/nested/RestConfig.java | 13 ++
.../rpc/protocol/tri/servlet/TripleFilter.java | 4 ++-
.../remoting/http12/message/codec/CodecUtils.java | 30 --
.../main/java/org/apache/dubbo/rpc/Constants.java | 1 +
.../h12/http1/Http1UnaryServerChannelObserver.java | 15 ++-
5 files changed, 53 insertions(+), 10 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/RestConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/RestConfig.java
index 4e8d6a54ef..be813c68e5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/RestConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/RestConfig.java
@@ -67,6 +67,11 @@ public class RestConfig implements Serializable {
*/
private String jsonFramework;
+/**
+ * The disallowed content-types.
+ */
+private String[] disallowedContentTypes;
+
/**
* The cors configuration.
*/
@@ -133,6 +138,14 @@ public class RestConfig implements Serializable {
this.jsonFramework = jsonFramework;
}
+public String[] getDisallowedContentTypes() {
+return disallowedContentTypes;
+}
+
+public void setDisallowedContentTypes(String[] disallowedContentTypes) {
+this.disallowedContentTypes = disallowedContentTypes;
+}
+
public CorsConfig getCors() {
return cors;
}
diff --git
a/dubbo-plugin/dubbo-triple-servlet/src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet/TripleFilter.java
b/dubbo-plugin/dubbo-triple-servlet/src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet/TripleFilter.java
index 85175d3d24..891cc24440 100644
---
a/dubbo-plugin/dubbo-triple-servlet/src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet/TripleFilter.java
+++
b/dubbo-plugin/dubbo-triple-servlet/src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet/TripleFilter.java
@@ -125,8 +125,10 @@ public class TripleFilter implements Filter {
channel, ServletExchanger.getUrl(),
FrameworkModel.defaultModel());
channel.setGrpc(false);
context.setTimeout(resolveTimeout(request, false));
-listener.onMetadata(new HttpMetadataAdapter(request));
ServletInputStream is = request.getInputStream();
+response.getOutputStream().setWriteListener(new
TripleWriteListener(channel));
+
+listener.onMetadata(new HttpMetadataAdapter(request));
listener.onData(new Http1InputMessage(
is.available() == 0 ? StreamUtils.EMPTY : new
ByteArrayInputStream(StreamUtils.readBytes(is;
} catch (Throwable t) {
diff --git
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/CodecUtils.java
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/CodecUtils.java
index 2b63feb1b0..143857e5fa 100644
---
a/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/CodecUtils.java
+++
b/dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/CodecUtils.java
@@ -17,17 +17,24 @@
package org.apache.dubbo.remoting.http12.message.codec;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.config.Configuration;
+import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.utils.Assert;
+import org.apache.dubbo.common.utils.StringUtils;
import
org.apache.dubbo.remoting.http12.exception.UnsupportedMediaTypeException;
import org.apache.dubbo.remoting.http12.message.HttpMessageDecoder;
import org.apache.dubbo.remoting.http12.message.HttpMessageDecoderFactory;
import org.apache.dubbo.remoting.http12.message.HttpMessageEncoder;
import org.apache.dubbo.remoting.http12.message.HttpMessageEncoderFactory;
+import org.apache.dubbo.rpc.Constants;
import org.apache.dubbo.rpc.model.FrameworkModel;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public final class CodecUtils {
@@ -37,13 +44,18 @@ public final class CodecUtils {
private final List encoderFactories;
private final Map>
encoderCache = new ConcurrentHashMap<>();
private final Map>
(dubbo) branch 3.3 updated: Bump sentinel.version from 1.8.6 to 1.8.8 (#14688)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 2bc04ba871 Bump sentinel.version from 1.8.6 to 1.8.8 (#14688) 2bc04ba871 is described below commit 2bc04ba8718348554ec38446e7c5f6d85cc2e1d3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 16:13:39 2024 +0800 Bump sentinel.version from 1.8.6 to 1.8.8 (#14688) Bumps `sentinel.version` from 1.8.6 to 1.8.8. Updates `com.alibaba.csp:sentinel-apache-dubbo3-adapter` from 1.8.6 to 1.8.8 Updates `com.alibaba.csp:sentinel-transport-simple-http` from 1.8.6 to 1.8.8 --- updated-dependencies: - dependency-name: com.alibaba.csp:sentinel-apache-dubbo3-adapter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.alibaba.csp:sentinel-transport-simple-http dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 266e1a06b7..657d3b16d7 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -136,7 +136,7 @@ 1.9.13 8.5.100 2.4.2 -1.8.6 +1.8.8 1.8.0 1.68.0 0.8.1
(dubbo) branch 3.3 updated (683ca80916 -> 1e32a188e3)
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 683ca80916 Bump grpc.version from 1.66.0 to 1.68.0 (#14706) add 1e32a188e3 Bump io.micrometer:micrometer-tracing-bom from 1.3.3 to 1.3.4 (#14682) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(dubbo) branch 3.3 updated (5ceadb94f4 -> c1512b6d3c)
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 5ceadb94f4 Bump com.alibaba.fastjson2:fastjson2 from 2.0.52 to 2.0.53 (#14707) add c1512b6d3c Bump org.awaitility:awaitility from 4.2.0 to 4.2.2 (#14708) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated (0f373c9601 -> 5ceadb94f4)
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 0f373c9601 Bump org.apache.groovy:groovy from 4.0.21 to 4.0.23 (#14709) add 5ceadb94f4 Bump com.alibaba.fastjson2:fastjson2 from 2.0.52 to 2.0.53 (#14707) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated (0a6e740ab3 -> 0f373c9601)
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 0a6e740ab3 Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14710) add 0f373c9601 Bump org.apache.groovy:groovy from 4.0.21 to 4.0.23 (#14709) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.3 updated: Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#14713)
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 The following commit(s) were added to refs/heads/3.3 by this push: new a397fa3970 Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#14713) a397fa3970 is described below commit a397fa397070f3af67e09fd208bae4f028d3dea3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 16:11:30 2024 +0800 Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#14713) Bumps commons-io:commons-io from 2.16.1 to 2.17.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-maven-plugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 7b8f7c7dc4..a2cf57d3e2 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -149,7 +149,7 @@ 1.2.13 2.24.0 -2.16.1 +2.17.0 1.16.0 4.0.21 diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml index dbb042bd8a..1cceffbaaa 100644 --- a/dubbo-maven-plugin/pom.xml +++ b/dubbo-maven-plugin/pom.xml @@ -75,7 +75,7 @@ commons-io commons-io - 2.16.1 + 2.17.0
(dubbo) branch 3.3 updated: Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14710)
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 The following commit(s) were added to refs/heads/3.3 by this push: new 0a6e740ab3 Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14710) 0a6e740ab3 is described below commit 0a6e740ab38d0fbf26f06283563b177c1abd9042 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 27 16:11:51 2024 +0800 Bump io.zipkin.reporter2:zipkin-reporter-bom from 3.4.0 to 3.4.2 (#14710) Bumps [io.zipkin.reporter2:zipkin-reporter-bom](https://github.com/openzipkin/zipkin-reporter-java) from 3.4.0 to 3.4.2. - [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases) - [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md) - [Commits](https://github.com/openzipkin/zipkin-reporter-java/compare/3.4.0...3.4.2) --- updated-dependencies: - dependency-name: io.zipkin.reporter2:zipkin-reporter-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index a2cf57d3e2..1cf637e7b9 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -122,7 +122,7 @@ 0.1.35 1.13.4 1.39.0 -3.4.0 +3.4.2 1.3.3 3.3 0.16.0 diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml index 3a29178406..55cbee27b4 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml @@ -39,7 +39,7 @@ 1.13.4 1.3.3 1.42.0 -3.4.1 +3.4.2 0.16.0
(dubbo) branch 3.3.0-release deleted (was aa20c9bc41)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.3.0-release in repository https://gitbox.apache.org/repos/asf/dubbo.git was aa20c9bc41 Prepare 3.3.0 release The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(dubbo) branch 3.2.16-release deleted (was c2894d112b)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2.16-release in repository https://gitbox.apache.org/repos/asf/dubbo.git was c2894d112b Merge branch 'refs/heads/apache-3.2' into 3.2.16-release The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r71541 - in /release/dubbo: 3.3.0-beta.5/ 3.3.0/ 3.3.0/apache-dubbo-3.3.0.zip 3.3.0/apache-dubbo-3.3.0.zip.asc 3.3.0/apache-dubbo-3.3.0.zip.sha512
Author: albumenj Date: Fri Sep 13 08:09:12 2024 New Revision: 71541 Log: Release Apache Dubbo 3.3.0 RC1 Added: release/dubbo/3.3.0/ release/dubbo/3.3.0/apache-dubbo-3.3.0.zip (with props) release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.asc release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.sha512 Removed: release/dubbo/3.3.0-beta.5/ Added: release/dubbo/3.3.0/apache-dubbo-3.3.0.zip == Binary file - no diff available. Propchange: release/dubbo/3.3.0/apache-dubbo-3.3.0.zip -- svn:mime-type = application/octet-stream Added: release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.asc == --- release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.asc (added) +++ release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.asc Fri Sep 13 08:09:12 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEFcfFqQs6t3A0GIYZEkta3Ssknt0FAmbcI30ACgkQEkta3Ssk +nt1y2g/+M6vMzeNrzi+CFHQ1hSsfWJneHBE9emyqnQmPFyeWOOV0Xb1CGJoPFTHp +Yu4AYpRMn+kxhmtq4iXvj1EYO2yASxA/xxpmZ1ZhMYCTbX/WoaYxO5fuqwuu9GXJ +FzOZ4ioSKQoPnmqIn7IDpUqS61529vX0Iw388tB4pE18Q9m2N5DFxwPhH+hTdAo/ +Uoi/Tle6oQWMwlFDxF9Go3gb0bwGHvJNKZu/wJVaBmb8xcnkHVGbnsA+h/1U25C8 +CyyK50+n8i0xrb8Nv4RjDmGeT5ru3S47j/b7xl8A9O1t1zCYpi4Q5fPdhWthG8HH +OJZcZEE7hcBjCVPAH3MhauUJWYtOBNSiVH1QB4oIiVUe5URThW3adSGiac0eY7ee +k/bhOpZLAZoorKyxnreUUGbre2QeLnTQPmjbVdfm4Xq5EeMTAa6pwWJ87Xfg7bCH +2Lo1Utr1nhOTZ2gv6PZkFnnb3jJxXEtuzumv7NePAT1goaUXtllYGzncUApvq5yA +XePV5tyhipuVeITCKpJGOlmxU+wjc+CJ1a6W0Am6sQCj5ZG2itk0MfA2lFBR8xko +19FQEMZk4lA6v5fVjAX7hUdQtNd7P3h4zUu5F9BJYUTiRTsfdBO9gebTelCebx9B +9udDqr6by/wjipo4GrYiFJ6d3wNVhjfoFRdDndyPp477mpl49EY= +=ZKqD +-END PGP SIGNATURE- Added: release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.sha512 == --- release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.sha512 (added) +++ release/dubbo/3.3.0/apache-dubbo-3.3.0.zip.sha512 Fri Sep 13 08:09:12 2024 @@ -0,0 +1 @@ +78db45dc5a42bc25dc7203800ee95e0dc3b1557d31843173b514640158397a2c854c383e0bb64581c7469cf1bebf9c5676236be51c650150cd88f4846b13b9d5 apache-dubbo-3.3.0.zip
svn commit: r71540 - in /release/dubbo: 3.2.15/ 3.2.16/ 3.2.16/apache-dubbo-3.2.16.zip 3.2.16/apache-dubbo-3.2.16.zip.asc 3.2.16/apache-dubbo-3.2.16.zip.sha512
Author: albumenj Date: Fri Sep 13 08:08:46 2024 New Revision: 71540 Log: Release Apache Dubbo 3.2.16 RC1 Added: release/dubbo/3.2.16/ release/dubbo/3.2.16/apache-dubbo-3.2.16.zip (with props) release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 Removed: release/dubbo/3.2.15/ Added: release/dubbo/3.2.16/apache-dubbo-3.2.16.zip == Binary file - no diff available. Propchange: release/dubbo/3.2.16/apache-dubbo-3.2.16.zip -- svn:mime-type = application/octet-stream Added: release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc == --- release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc (added) +++ release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc Fri Sep 13 08:08:46 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEFcfFqQs6t3A0GIYZEkta3Ssknt0FAmbcIzAACgkQEkta3Ssk +nt3oSBAAidcokzykq5BPx6qhREONZW6/CgKvUIaEYsRifAmgnc5u1fISab/F8u4U +XlkHwBn3kMORyedIkzOJku2RGS2b36g7VjxVKLeaPZkXb0+whuuu2E/9yjU6LKnd +uJUVczrwWDKVlgtbMSLw8abN8ZhqdFVpgl5wHuLpvidnnLnL75fjNbnTuGYPFP35 +CyhCIEDCXn/Lk++/n2k6nIvi+Cl/O/7XmloH7zYSXWAlkOE2g0g/ebT3UxKXzMSU +y8bWNYcca0qWNapYpBajj5tEzXJLjKqdTqwaHkNvwAiG42Y9xBNA+PRaAxR9k5tj +6qJVH5xKKAR9cUPIepwAN2UjklVW2BKFNPxpkjaKynEUiIbv/ebXV1zc5Tsg/2/G +qLdo8c+uZY7wgr/PHrff7yyPd5Yb9VTCUsuTNAlGwA8F+notF+3cdTNgNDNzpuT5 +LNXF9ad15v3OfNvhHAHBHSwmbfdsDveqYqoC8YkEbjC73axKn04rsWc83E+dIjv5 +Juc4wNRYVX/7Ygeg11iJ/NNLGpmLynEHCOrxvibla45Lb5JDWGKcHHUhpAevWoGe +lwNIVTJI8ZMQJRGnqSpqaMBT8IWla83epVi/EUTttDRJt836susRBi8C0HObbZyi +jlAl5kB9guyt1mfYrGSo1S/Tw1ctRDzC1SLazBbt6cJvDf3etyc= +=pfYb +-END PGP SIGNATURE- Added: release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 == --- release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 (added) +++ release/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 Fri Sep 13 08:08:46 2024 @@ -0,0 +1 @@ +29cebcd8263251141144a00916158768dd3b94d97584d627edb2d1c9205d30280ca7f9916d901582099db3be16ad038e5b03e2aa400a4ba31a7e223b1d954724 apache-dubbo-3.2.16.zip
svn commit: r71539 - /dev/dubbo/dubbo/3.3.0/
Author: albumenj Date: Fri Sep 13 08:07:46 2024 New Revision: 71539 Log: Release Apache Dubbo 3.3.0 RC1 Removed: dev/dubbo/dubbo/3.3.0/
svn commit: r71538 - /dev/dubbo/dubbo/3.2.16/
Author: albumenj Date: Fri Sep 13 08:07:18 2024 New Revision: 71538 Log: Release Apache Dubbo 3.2.16 RC1 Removed: dev/dubbo/dubbo/3.2.16/
(dubbo-website) branch master updated: Fix config toml
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 1f4ac064602 Fix config toml 1f4ac064602 is described below commit 1f4ac0646029316434ec3415b2cd85677cd1224f Author: Albumen Kevin AuthorDate: Fri Sep 13 16:05:27 2024 +0800 Fix config toml --- cn_config.toml | 108 ++--- 1 file changed, 80 insertions(+), 28 deletions(-) diff --git a/cn_config.toml b/cn_config.toml index 8fd6d8df161..0692a8ba5a8 100644 --- a/cn_config.toml +++ b/cn_config.toml @@ -68,6 +68,81 @@ contentDir = "content/zh-cn" #time_format_default = "02.01.2006" #time_format_blog = "02.01.2006" +[languages.en.params.community] +navLabel = "COMMUNITY" +weight = 2 +[[languages.en.params.community.navOptions.items]] +name = "News" +url = "/en/blog/news/" +[[languages.en.params.community.navOptions.items]] +name = "Security Notices" +url = "/en/overview/notices/" +[[languages.en.params.community.navOptions.items]] +name = "Contributor's Guide" +url = "/zh-cn/contact/" +#[[languages.en.params.community.navOptions.items]] +#name = "Meet The Team" +#url = "" + +# Weight used for sorting. +weight = 2 +[languages.zh-cn.params.community] +navLabel = "联系社区" +weight = 2 +[[languages.zh-cn.params.community.navOptions.items]] +name = "新闻" +url = "/zh-cn/blog/news/" +[[languages.zh-cn.params.community.navOptions.items]] +name = "安全公告" +url = "/zh-cn/overview/notices/" +[[languages.zh-cn.params.community.navOptions.items]] +name = "贡献者指南" +url = "/zh-cn/contact/" +#[[languages.zh-cn.params.community.navOptions.items]] +#name = "认识团队" +#url = "" + + + +[languages.en.params.ecosystem] +navLabel = "ECOSYSTEM" +weight = 2 +[[languages.en.params.ecosystem.navOptions.items]] +name = "Code Generator" +url = "https://start.dubbo.apache.org/"; +[[languages.en.params.ecosystem.navOptions.items]] +name = "Visualizable Console" +url = "/zh-cn/overview/mannual/control-plane/" +#[[languages.en.params.ecosystem.navOptions.items]] +#name = "Benchmarking" +#url = "http://47.251.95.138:3000/public-dashboards/b75030ae3d0f402ca06b6826de3b590b?orgId=1"; +[[languages.en.params.ecosystem.navOptions.items]] +name = "Proxyless Mesh" +url = "/zh-cn/overview/what/core-features/service-mesh/" +[[languages.en.params.ecosystem.navOptions.items]] +name = "More Demos" +url = "https://github.com/apache/dubbo-samples"; + + +[languages.zh-cn.params.ecosystem] +navLabel = "生态" +weight = 2 +[[languages.zh-cn.params.ecosystem.navOptions.items]] +name = "代码生成" +url = "https://start.dubbo.apache.org/"; +[[languages.zh-cn.params.ecosystem.navOptions.items]] +name = "可视化控制台" +url = "/zh-cn/overview/mannual/control-plane/" +#[[languages.zh-cn.params.ecosystem.navOptions.items]] +#name = "商城系统" +#url = "http://47.251.95.138:3000/public-dashboards/b75030ae3d0f402ca06b6826de3b590b?orgId=1"; +[[languages.zh-cn.params.ecosystem.navOptions.items]] +name = "无代理网格" +url = "/zh-cn/overview/what/core-features/service-mesh/" +[[languages.zh-cn.params.ecosystem.navOptions.items]] +name = "更多样例" +url = "https://github.com/apache/dubbo-samples"; + [markup] [markup.goldmark] [markup.goldmark.renderer] @@ -94,20 +169,13 @@ github_branch = "master" # Specify a value here if your content directory is not in your repo's root directory # github_subdir = "" -# Enable syntax highlighting and copy buttons on code blocks with Prism -#prism_syntax_highlighting = false - #gcs_engine_id = "011737558837375720776:fsdu1nryfng" algolia_docsearch = true offlineSearch = false -[[menu.main]] -name = "Initializer" -weight = 50 -url = "https://start.dubbo.apache.org/bootstrap.html"; -post = "" + #[[menu.main]] #name = "Admin" #weight = 60 @@ -140,6 +208,9 @@ offlineSearch = false # en.docs.url = "https://chickenlj.github.io/incubator-dubbo-website/en/admin/"; # cn.docs.url = "https://chickenlj.github.io/incubator-dubbo-website/cn/admin/"; +# Enable syntax highlighting and copy buttons on code blocks with Prism +#prism_syntax_highlighting = false + # User interface configuration [params.ui] # https://github.com/gohugoio/hugo/issues/8918#issuecomment-903314696 @@ -156,7 +227,7 @@ sidebar_search_disable = true nav
(dubbo-website) branch master updated: Fix hugo compile failed
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 12b6b8ee18e Fix hugo compile failed
12b6b8ee18e is described below
commit 12b6b8ee18ebccb9578057a4bfd128889cce0250
Author: Albumen Kevin
AuthorDate: Fri Sep 13 15:59:11 2024 +0800
Fix hugo compile failed
---
.github/workflows/build_and_deploy.yml | 4 ++--
layouts/blog/baseof.html | 4 ++--
layouts/docs/baseof.html | 4 ++--
layouts/partials/css.html | 2 +-
layouts/partials/scripts.html | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build_and_deploy.yml
b/.github/workflows/build_and_deploy.yml
index 88b4727827c..8a29e26bd5f 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -24,7 +24,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: '0.127.0'
+ hugo-version: 'latest'
extended: true
- name: Build
env:
@@ -59,7 +59,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: '0.127.0'
+ hugo-version: 'latest'
extended: true
- name: Build
env:
diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html
index 296c02e1a46..46a9102ac5b 100755
--- a/layouts/blog/baseof.html
+++ b/layouts/blog/baseof.html
@@ -33,11 +33,11 @@
{{ partial "docs/thirdparty-disclaimer.html" . }}
{{- end -}}
{{- end -}}
-{{ if (and (not .Params.hide_feedback)
(.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
+{{ if (and (not .Params.hide_feedback)
(.Site.Params.ui.feedback.enable) (.Site.Config.Services.GoogleAnalytics.ID)) }}
{{ partial "feedback.html" .Site.Params.ui.feedback }}
{{ end }}
-{{ if (.Site.DisqusShortname) }}
+{{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index e2cbe533b74..5ca06503131 100755
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -36,10 +36,10 @@
{{ partial "docs/thirdparty-disclaimer.html" . }}
{{- end -}}
{{- end -}}
-
+
-{{ if (.Site.DisqusShortname) }}
+{{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/layouts/partials/css.html b/layouts/partials/css.html
index 19951b88392..66b3b623d55 100755
--- a/layouts/partials/css.html
+++ b/layouts/partials/css.html
@@ -1,6 +1,6 @@
-{{ $inServerMode := site.IsServer }}
+{{ $inServerMode := hugo.IsServer }}
{{- if .Params.case_study_styles }}
{{ $cssOutput := "css/case-studies.css" }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 8406b5fe890..9c2dcf8c6c5 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -57,7 +57,7 @@
{{ $jsSearch = resources.Get "js/offline-search.js" }}
{{ end }}
{{ $js := (slice $jsSearch) | resources.Concat "js/main.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
{{ else }}
{{ $js := $js | minify | fingerprint }}
(dubbo-website) branch master updated: Fix hugo version
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 00c9f3edba8 Fix hugo version 00c9f3edba8 is described below commit 00c9f3edba823cc826edf4513f7f992fa84f3857 Author: Albumen Kevin AuthorDate: Fri Sep 13 15:56:16 2024 +0800 Fix hugo version --- .github/workflows/build_and_deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 8a29e26bd5f..88b4727827c 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - hugo-version: 'latest' + hugo-version: '0.127.0' extended: true - name: Build env: @@ -59,7 +59,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - hugo-version: 'latest' + hugo-version: '0.127.0' extended: true - name: Build env:
(dubbo) 02/03: Merge branch 'refs/heads/3.3.0-release' into apache-3.3
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 cc1e680223581fa73dbb7809e85daf9467135cdf Merge: f6561f0596 aa20c9bc41 Author: Albumen Kevin AuthorDate: Fri Sep 13 15:49:06 2024 +0800 Merge branch 'refs/heads/3.3.0-release' into apache-3.3 dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(dubbo) 01/03: Merge branch 'refs/heads/apache-3.2' into apache-3.3
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 f6561f059635d939bf2c460d6c921799f1bddbb9
Merge: 79ff881b48 ef253c9ba4
Author: Albumen Kevin
AuthorDate: Fri Sep 13 15:48:57 2024 +0800
Merge branch 'refs/heads/apache-3.2' into apache-3.3
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
#
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java
# dubbo-spring-boot/pom.xml
# pom.xml
.../dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 8
.../org/apache/dubbo/remoting/telnet/support/TelnetUtils.java | 8
.../{ChanelHandlerTest.java => ChannelHandlerTest.java}| 10 +-
.../java/org/apache/dubbo/remoting/PerformanceClientTest.java | 4 ++--
.../src/main/java/org/apache/dubbo/rpc/Constants.java | 1 +
.../apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java | 2 +-
.../apache/dubbo/rpc/protocol/injvm/InjvmClassLoaderTest.java | 2 +-
.../dubbo-rpc-triple/src/main/proto/reflectionV1Alpha.proto| 4 ++--
.../dubbo-spring-boot-starters/observability/pom.xml | 2 +-
dubbo-spring-boot/pom.xml | 2 +-
pom.xml| 2 +-
13 files changed, 25 insertions(+), 24 deletions(-)
diff --cc dubbo-dependencies-bom/pom.xml
index 6bbdf4f855,6d18fb6921..b058d569cc
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -92,10 -93,9 +92,10 @@@
5.3.39
5.8.14
3.30.2-GA
-1.15.1
+1.15.1
3.2.10.Final
- 4.1.112.Final
+ 4.1.113.Final
+0.0.28.Final
4.5.14
4.4.16
1.2.83
@@@ -108,8 -108,7 +108,8 @@@
3.25.4
1.3.2
3.1.0
+6.1.0
- 9.4.55.v20240627
+ 9.4.56.v20240826
3.1.0
1.1.0.Final
5.4.3.Final
@@@ -135,9 -133,7 +135,9 @@@
3.15.6.Final
1.9.13
8.5.100
- 2.4.1
+ 2.4.2
+1.8.6
+1.6.1
1.66.0
0.8.1
1.2.2
@@@ -148,20 -143,13 +148,20 @@@
1.2.17
1.2.13
- 2.23.1
+ 2.24.0
2.16.1
+1.16.0
+4.0.21
+
+5.9.3
+4.13.2
+4.2.0
+2.2
+2.2.2
1.4.3
-
-
-
1.0.11
+4.11.0
+2.3-groovy-4.0
2.2.7
1.2.0
diff --cc
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
index 3e34880187,dd656bc013..c5b4bdb18a
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
@@@ -101,19 -97,14 +101,20 @@@ public interface Constants
String INVOCATION_KEY = "invocation";
String SERIALIZATION_ID_KEY = "serialization_id";
-String H2_SETTINGS_HEADER_TABLE_SIZE_KEY =
"dubbo.rpc.tri.header-table-size";
-String H2_SETTINGS_ENABLE_PUSH_KEY = "dubbo.rpc.tri.enable-push";
-String H2_SETTINGS_MAX_CONCURRENT_STREAMS_KEY =
"dubbo.rpc.tri.max-concurrent-streams";
-String H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY =
"dubbo.rpc.tri.initial-window-size";
+String HTTP3_KEY = "http3";
+
+String H2_SETTINGS_SUPPORT_NO_LOWER_HEADER_KEY =
"dubbo.rpc.tri.support-no-lower-header";
+String H2_SETTINGS_IGNORE_1_0_0_KEY =
"dubbo.rpc.tri.ignore-1.0.0-version";
+String H2_SETTINGS_RESOLVE_FALLBACK_TO_DEFAULT_KEY =
"dubbo.rpc.tri.resolve-fallback-to-default";
+String H2_SETTINGS_BUILTIN_SERVICE_INIT =
"dubbo.tri.builtin.service.init";
+
+String H2_SETTINGS_JSON_FRAMEWORK_NAME =
"dubbo.protocol.triple.rest.json-framework";
+
+String H2_SETTINGS_VERBOSE_ENABLED = "dubbo.protocol.triple.verbose";
+String H2_SETTINGS_SERVLET_ENABLED =
"dubbo.protocol.triple.servlet.enabled";
+String H3_SETTINGS_HTTP3_ENABLED = "dubbo.protocol.triple.http3.enabled";
+String H3_SETTINGS_HTTP3_NEGOTIATION =
"dubbo.protocol.triple.http3.negotiation";
+ String H2_SETTINGS_CONNECTION_INITIAL_WINDOW_SIZE_KEY =
"dubbo.rpc.tri.connection-initial-window-size";
-String H2_SETTINGS_MAX_FRAME_SIZE_KEY = "dubbo.rpc.tri.max-frame-size";
-String H2_SETTINGS_MAX_HEADER_LIST_SIZE_KEY =
"dubbo.rpc.tri.max-header-list-size";
String ADAPTIVE_LOADBALAN
(dubbo) branch 3.3 updated (79ff881b48 -> bf51a34cc4)
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 79ff881b48 fix:tcp connection window size split from stream connection
window size for 3.3 (#14670)
add d873f77f79 Bump bytebuddy.version from 1.15.0 to 1.15.1 (#14648)
add 7453a94d0f Bump log4j2_version from 2.23.1 to 2.24.0 (#14649)
add 7e5265f9c4 Bump jetty_version from 9.4.55.v20240627 to
9.4.56.v20240826 (#14650)
add 4d51a5a21d Bump io.opentelemetry:opentelemetry-bom from 1.41.0 to
1.42.0 (#14651)
add 9a93622d13 Bump netty4_version from 4.1.112.Final to 4.1.113.Final
(#14652)
add 34c976e021 Bump ch.qos.logback:logback-core from 1.5.7 to 1.5.8
(#14653)
add f37b28b56b Bump org.eclipse.jetty:jetty-maven-plugin (#14654)
add c804919345 Bump com.alibaba.nacos:nacos-client from 2.4.1 to 2.4.2
(#14655)
add ddb3fba7d0 fix:tcp connection window size split from stream connection
window size (#14664)
add c833069d53 Fix (#14671)
add 4a7489739c Prepare 3.2.16 release
add c2894d112b Merge branch 'refs/heads/apache-3.2' into 3.2.16-release
add 43c85d149b Merge branch 'refs/heads/3.2.16-release' into apache-3.2
add ef253c9ba4 bump to 3.2.17-SNAPSHOT
new f6561f0596 Merge branch 'refs/heads/apache-3.2' into apache-3.3
add aa20c9bc41 Prepare 3.3.0 release
new cc1e680223 Merge branch 'refs/heads/3.3.0-release' into apache-3.3
new bf51a34cc4 bump to 3.3.1-SNAPSHOT
The 3 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:
.../dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 10 +-
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
dubbo-plugin/dubbo-rest-jaxrs/pom.xml | 2 +-
dubbo-plugin/dubbo-rest-spring/pom.xml | 2 +-
.../org/apache/dubbo/remoting/telnet/support/TelnetUtils.java | 8
.../{ChanelHandlerTest.java => ChannelHandlerTest.java}| 10 +-
.../java/org/apache/dubbo/remoting/PerformanceClientTest.java | 4 ++--
.../src/main/java/org/apache/dubbo/rpc/Constants.java | 1 +
.../apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java | 2 +-
.../apache/dubbo/rpc/protocol/injvm/InjvmClassLoaderTest.java | 2 +-
.../dubbo-rpc-triple/src/main/proto/reflectionV1Alpha.proto| 4 ++--
.../dubbo-spring-boot-starters/observability/pom.xml | 2 +-
dubbo-spring-boot/pom.xml | 2 +-
pom.xml| 4 ++--
16 files changed, 30 insertions(+), 29 deletions(-)
rename
dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/{ChanelHandlerTest.java
=> ChannelHandlerTest.java} (95%)
(dubbo) 03/03: bump to 3.3.1-SNAPSHOT
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 bf51a34cc488da23da1dcd4ec49b40e5e30ba632 Author: Albumen Kevin AuthorDate: Fri Sep 13 15:49:43 2024 +0800 bump to 3.3.1-SNAPSHOT --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-plugin/dubbo-rest-jaxrs/pom.xml| 2 +- dubbo-plugin/dubbo-rest-spring/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 52fafaf063..910b8ac61a 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -187,7 +187,7 @@ 4.0.1 2.3.3-b02 -3.3.0 +3.3.1-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 1c2c97cc4c..b45047ba0e 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -39,7 +39,7 @@ 1.0.0 2.38.0 -3.3.0 +3.3.1-SNAPSHOT diff --git a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml index 32b43a2d00..fd967b07ec 100644 --- a/dubbo-plugin/dubbo-rest-jaxrs/pom.xml +++ b/dubbo-plugin/dubbo-rest-jaxrs/pom.xml @@ -104,7 +104,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.0-beta.2 + 3.3.1-SNAPSHOT test diff --git a/dubbo-plugin/dubbo-rest-spring/pom.xml b/dubbo-plugin/dubbo-rest-spring/pom.xml index a18d8a9f23..671cc8bd28 100644 --- a/dubbo-plugin/dubbo-rest-spring/pom.xml +++ b/dubbo-plugin/dubbo-rest-spring/pom.xml @@ -113,7 +113,7 @@ org.apache.dubbo dubbo-rpc-rest - 3.3.0-beta.2 + 3.3.1-SNAPSHOT test diff --git a/pom.xml b/pom.xml index cb5f039691..fba114a047 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ check 1.0.0 2.38.0 -3.3.0 +3.3.1-SNAPSHOT
(dubbo) branch 3.2 updated (c833069d53 -> ef253c9ba4)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from c833069d53 Fix (#14671) add 4a7489739c Prepare 3.2.16 release add c2894d112b Merge branch 'refs/heads/apache-3.2' into 3.2.16-release new 43c85d149b Merge branch 'refs/heads/3.2.16-release' into apache-3.2 new ef253c9ba4 bump to 3.2.17-SNAPSHOT The 2 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: dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
(dubbo) 02/02: bump to 3.2.17-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git commit ef253c9ba45fd5367387fa42b8d39c5cdfbe1d05 Author: Albumen Kevin AuthorDate: Fri Sep 13 15:45:44 2024 +0800 bump to 3.2.17-SNAPSHOT --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 0c8b5b8735..6d18fb6921 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -170,7 +170,7 @@ check 1.0.0 2.38.0 -3.2.16 +3.2.17-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 51d8440c42..031885bc5c 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -31,7 +31,7 @@ pom -3.2.16 +3.2.17-SNAPSHOT 1.6.0 5.1.0 3.8.4 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index c2bef3b8f5..723e078c37 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -31,7 +31,7 @@ pom -3.2.16 +3.2.17-SNAPSHOT 1.6.0 4.3.0 3.4.14 diff --git a/pom.xml b/pom.xml index 185331bb75..4711ab8129 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ check 1.0.0 2.38.0 -3.2.16 +3.2.17-SNAPSHOT
(dubbo) 01/02: Merge branch 'refs/heads/3.2.16-release' into apache-3.2
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 43c85d149b42d65510dfbe53a8fb6c3c90c9905e Merge: c833069d53 c2894d112b Author: Albumen Kevin AuthorDate: Fri Sep 13 15:45:01 2024 +0800 Merge branch 'refs/heads/3.2.16-release' into apache-3.2 dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
(dubbo-website) branch master updated: Update hugo version
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new ef5a3eece7a Update hugo version
ef5a3eece7a is described below
commit ef5a3eece7a80bb609beecc5a11a3ecf84e6ddb1
Author: Albumen Kevin
AuthorDate: Fri Sep 13 15:41:02 2024 +0800
Update hugo version
---
.github/workflows/build_and_deploy.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build_and_deploy.yml
b/.github/workflows/build_and_deploy.yml
index 0d98847e93f..8a29e26bd5f 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -24,7 +24,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: '0.122.0'
+ hugo-version: 'latest'
extended: true
- name: Build
env:
@@ -59,7 +59,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: '0.122.0'
+ hugo-version: 'latest'
extended: true
- name: Build
env:
@@ -84,4 +84,4 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: cn-site
publish_dir: ./static
- keep_files: true
\ No newline at end of file
+ keep_files: true
(dubbo-website) branch history/next updated (3faab9c8060 -> a3faaaad4cd)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 3faab9c8060 Fix quickstart docs add c29dcaef4d0 Update release version add e69ac2c7097 Update upload artifact version add 040905400f0 Fix skywalking.md Chinese typos (#3031) add a3fd4cd Merge branch 'refs/heads/master' into history/next No new revisions were added by this update. Summary of changes: .../mannual/java-sdk/tasks/observability/tracing/skywalking.md | 2 +- data/download/en/1javaReleases.yaml| 10 +- data/download/zh/1javaReleases.yaml| 10 +- 3 files changed, 11 insertions(+), 11 deletions(-)
(dubbo-website) branch history/next updated (8bb1052014c -> 3faab9c8060)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 8bb1052014c Add link add 3faab9c8060 Fix quickstart docs No new revisions were added by this update. Summary of changes: .../others/logger-howto.md | 2 +- .../overview/mannual/java-sdk/quick-start/deploy.md | 2 ++ .../mannual/java-sdk/quick-start/starter.md | 6 +++--- .../reference-manual/graalvm/support-graalvm.md | 20 ++-- .../java-sdk/reference-manual/registry/nacos.md | 6 +++--- .../mannual/java-sdk/tasks/develop/springboot.md| 2 +- .../java-sdk/tasks/framework/lightweight-rpc.md | 4 ++-- .../java-sdk/tasks/service-discovery/nacos.md | 6 +++--- .../java-sdk/tasks/service-discovery/zookeeper.md | 12 ++-- content/zh-cn/overview/mannual/java-sdk/versions.md | 12 ++-- data/download/en/1javaReleases.yaml | 10 +- data/download/zh/1javaReleases.yaml | 10 +- static/imgs/v3/quickstart/samples.jpg | Bin 0 -> 133568 bytes static/imgs/v3/quickstart/start.jpg | Bin 0 -> 486805 bytes 14 files changed, 47 insertions(+), 45 deletions(-) create mode 100644 static/imgs/v3/quickstart/samples.jpg create mode 100644 static/imgs/v3/quickstart/start.jpg
(dubbo-initializer) branch main updated: Update metadata.yaml
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-initializer.git The following commit(s) were added to refs/heads/main by this push: new a132d89 Update metadata.yaml a132d89 is described below commit a132d89a8cd3f5b3153eb28a2abfd7a55b03d3bb Author: Albumen Kevin AuthorDate: Thu Sep 12 09:50:18 2024 +0800 Update metadata.yaml --- initializer-generator/src/main/resources/metadata.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/initializer-generator/src/main/resources/metadata.yaml b/initializer-generator/src/main/resources/metadata.yaml index 94a9c73..6d8d0e8 100644 --- a/initializer-generator/src/main/resources/metadata.yaml +++ b/initializer-generator/src/main/resources/metadata.yaml @@ -1188,11 +1188,11 @@ initializr: id: 2.7.10 default: true dubboVersions: -- name: 3.3.0-beta.1 - id: 3.3.0-beta.1 -- name: 3.2.10 - id: 3.2.10 +- name: 3.3.0 + id: 3.3.0 default: true +- name: 3.2.16 + id: 3.2.16 - name: 3.1.11 id: 3.1.11 architecture:
(dubbo-website) branch master updated: Fix skywalking.md Chinese typos (#3031)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 040905400f0 Fix skywalking.md Chinese typos (#3031) 040905400f0 is described below commit 040905400f0686d635732b464761beedca5aa654 Author: yangzehan <76773988+yangze...@users.noreply.github.com> AuthorDate: Wed Sep 11 16:59:22 2024 +0800 Fix skywalking.md Chinese typos (#3031) --- content/zh-cn/overview/tasks/observability/tracing/skywalking.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh-cn/overview/tasks/observability/tracing/skywalking.md b/content/zh-cn/overview/tasks/observability/tracing/skywalking.md index 49b65a13954..07c3414ffdf 100644 --- a/content/zh-cn/overview/tasks/observability/tracing/skywalking.md +++ b/content/zh-cn/overview/tasks/observability/tracing/skywalking.md @@ -63,7 +63,7 @@ bash startup.sh 之后，启动 Provider 和 Consumer 并确保 skywalking-agent 参数被正确设置，skywalking-agent 确保数据可以被正确的上报到后台系统。 -* 考虑到 skywalking-agent 本身也有内置的 Dubbo 拦截器，为了确保示例能使用 Dubbo 自带的 Micrometer 集成，我么你需要删除 skywalking-agent 自带的拦截器，直接将 `plugins` 目录删除即可 +* 考虑到 skywalking-agent 本身也有内置的 Dubbo 拦截器，为了确保示例能使用 Dubbo 自带的 Micrometer 集成，我们需要你删除 skywalking-agent 自带的拦截器，直接将 `plugins` 目录删除即可 * 配置 Skywalking OAP 服务器地址，在以下文件中配置 OAP 地址 `/path/to/skywalking-agent/agent.config`，对应的参数项为 `collector.backend_service`。 ```shell
(dubbo-website) branch history/next updated (27387ce9021 -> 8bb1052014c)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 27387ce9021 Fix style add 8bb1052014c Add link No new revisions were added by this update. Summary of changes: content/zh-cn/blog/news/apache-33-release.md | 2 ++ 1 file changed, 2 insertions(+)
(dubbo) branch 3.2 updated (f37b28b56b -> c804919345)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from f37b28b56b Bump org.eclipse.jetty:jetty-maven-plugin (#14654) add c804919345 Bump com.alibaba.nacos:nacos-client from 2.4.1 to 2.4.2 (#14655) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.2 updated (34c976e021 -> f37b28b56b)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 34c976e021 Bump ch.qos.logback:logback-core from 1.5.7 to 1.5.8 (#14653) add f37b28b56b Bump org.eclipse.jetty:jetty-maven-plugin (#14654) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.2 updated: Bump ch.qos.logback:logback-core from 1.5.7 to 1.5.8 (#14653)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/3.2 by this push: new 34c976e021 Bump ch.qos.logback:logback-core from 1.5.7 to 1.5.8 (#14653) 34c976e021 is described below commit 34c976e021f72d35e65b8dcc7bca2bbef153725c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 11 16:42:41 2024 +0800 Bump ch.qos.logback:logback-core from 1.5.7 to 1.5.8 (#14653) Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.5.7 to 1.5.8. - [Commits](https://github.com/qos-ch/logback/compare/v_1.5.7...v_1.5.8) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index 67fd9797d4..58f0ad68e4 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml @@ -184,7 +184,7 @@ ch.qos.logback logback-core - 1.5.7 + 1.5.8 compile diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml index 10fa32152b..9998aa6af0 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml @@ -181,7 +181,7 @@ ch.qos.logback logback-core - 1.5.7 + 1.5.8 compile
(dubbo) branch 3.2 updated (4d51a5a21d -> 9a93622d13)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 4d51a5a21d Bump io.opentelemetry:opentelemetry-bom from 1.41.0 to 1.42.0 (#14651) add 9a93622d13 Bump netty4_version from 4.1.112.Final to 4.1.113.Final (#14652) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.2 updated (7e5265f9c4 -> 4d51a5a21d)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from 7e5265f9c4 Bump jetty_version from 9.4.55.v20240627 to 9.4.56.v20240826 (#14650) add 4d51a5a21d Bump io.opentelemetry:opentelemetry-bom from 1.41.0 to 1.42.0 (#14651) No new revisions were added by this update. Summary of changes: dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo) branch 3.2 updated: Bump jetty_version from 9.4.55.v20240627 to 9.4.56.v20240826 (#14650)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/3.2 by this push: new 7e5265f9c4 Bump jetty_version from 9.4.55.v20240627 to 9.4.56.v20240826 (#14650) 7e5265f9c4 is described below commit 7e5265f9c49a34e9dde9284509727feae69ae078 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 11 16:41:48 2024 +0800 Bump jetty_version from 9.4.55.v20240627 to 9.4.56.v20240826 (#14650) Bumps `jetty_version` from 9.4.55.v20240627 to 9.4.56.v20240826. Updates `org.eclipse.jetty:jetty-server` from 9.4.55.v20240627 to 9.4.56.v20240826 Updates `org.eclipse.jetty:jetty-servlet` from 9.4.55.v20240627 to 9.4.56.v20240826 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 5236fee4e7..d04127310b 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -108,7 +108,7 @@ 3.25.4 1.3.2 3.1.0 -9.4.55.v20240627 +9.4.56.v20240826 3.1.0 1.1.0.Final 5.4.3.Final
(dubbo) branch 3.2 updated (d873f77f79 -> 7453a94d0f)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git from d873f77f79 Bump bytebuddy.version from 1.15.0 to 1.15.1 (#14648) add 7453a94d0f Bump log4j2_version from 2.23.1 to 2.24.0 (#14649) No new revisions were added by this update. Summary of changes: dubbo-dependencies-bom/pom.xml | 2 +- dubbo-spring-boot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(dubbo) branch 3.2 updated: Bump bytebuddy.version from 1.15.0 to 1.15.1 (#14648)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/3.2 by this push: new d873f77f79 Bump bytebuddy.version from 1.15.0 to 1.15.1 (#14648) d873f77f79 is described below commit d873f77f79b53eb82cefe56c4009106f0d48766a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 11 16:41:02 2024 +0800 Bump bytebuddy.version from 1.15.0 to 1.15.1 (#14648) Bumps `bytebuddy.version` from 1.15.0 to 1.15.1. Updates `net.bytebuddy:byte-buddy` from 1.15.0 to 1.15.1 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.0...byte-buddy-1.15.1) Updates `net.bytebuddy:byte-buddy-agent` from 1.15.0 to 1.15.1 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.0...byte-buddy-1.15.1) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index 800f7df003..5f8c34782f 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -43,7 +43,7 @@ 2.23.1 -1.15.0 +1.15.1
(dubbo-website) branch history/202409 updated: Fix hugo version
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch history/202409 in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/history/202409 by this push: new d5d4671c9e1 Fix hugo version d5d4671c9e1 is described below commit d5d4671c9e1d42e10c7999d6836ff327ffa22292 Author: Albumen Kevin AuthorDate: Wed Sep 11 16:16:49 2024 +0800 Fix hugo version --- .github/workflows/build_and_deploy_history.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_deploy_history.yml b/.github/workflows/build_and_deploy_history.yml index c25fd94c3a7..b0033cbde65 100644 --- a/.github/workflows/build_and_deploy_history.yml +++ b/.github/workflows/build_and_deploy_history.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - hugo-version: 'latest' + hugo-version: '0.122.0' extended: true - name: Build env:
(dubbo-website) branch history/next updated (fc40e584706 -> 27387ce9021)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from fc40e584706 announce add 27387ce9021 Fix style No new revisions were added by this update. Summary of changes: assets/scss/_custom.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(dubbo-website) branch history/202409 created (now e69ac2c7097)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/202409 in repository https://gitbox.apache.org/repos/asf/dubbo-website.git at e69ac2c7097 Update upload artifact version No new revisions were added by this update.
(dubbo-website) branch master updated: Update upload artifact version
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new e69ac2c7097 Update upload artifact version
e69ac2c7097 is described below
commit e69ac2c70976c05c5c1e007c9acc02364ae01774
Author: Albumen Kevin
AuthorDate: Wed Sep 11 14:47:20 2024 +0800
Update upload artifact version
---
.github/workflows/link_check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/link_check.yml b/.github/workflows/link_check.yml
index ba049194b52..a80e74a76ee 100644
--- a/.github/workflows/link_check.yml
+++ b/.github/workflows/link_check.yml
@@ -50,7 +50,7 @@ jobs:
run: 7z a ${{ github.workspace }}/htmltest.zip tmp/.htmltest/* -r
- name: Upload lint result failure
if: failure()
-uses: actions/upload-artifact@v2
+uses: actions/upload-artifact@v4
with:
name: "htmltest.zip"
path: htmltest.zip
(dubbo-website) branch history/next updated (69269ed1cbf -> fc40e584706)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 69269ed1cbf Fix link add fc40e584706 announce No new revisions were added by this update. Summary of changes: content/zh-cn/blog/news/apache-33-release.md | 190 + data/announcements/zh/scheduled.yaml | 11 ++ layouts/shortcodes/blocks/cover.html | 2 +- .../0e6b75c3-3340-4bed-a566-88c46a03ada6.png | Bin 0 -> 70351 bytes .../53a6f3c7-20ad-49f6-abc0-4e2d80a9597d.png | Bin 0 -> 638971 bytes .../5f8ebef5-08f3-463a-bb86-14b32a09ebb2.png | Bin 0 -> 750937 bytes .../68b69954-9df2-48b2-bd63-fe07ba8cb25b.png | Bin 0 -> 878159 bytes .../78d6744b-928a-41d4-857c-ff91ad69c896.png | Bin 0 -> 1109403 bytes .../7e4f3ced-9932-472f-bb8f-272ec97a7fbe.png | Bin 0 -> 898694 bytes .../c7d4f983-f619-4d39-94b6-5d62fd5a430e.png | Bin 0 -> 675717 bytes .../ee5812e0-a90b-4a02-abab-b658cdddefc1.png | Bin 0 -> 438261 bytes 11 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 content/zh-cn/blog/news/apache-33-release.md create mode 100644 static/imgs/blog/33-release/0e6b75c3-3340-4bed-a566-88c46a03ada6.png create mode 100644 static/imgs/blog/33-release/53a6f3c7-20ad-49f6-abc0-4e2d80a9597d.png create mode 100644 static/imgs/blog/33-release/5f8ebef5-08f3-463a-bb86-14b32a09ebb2.png create mode 100644 static/imgs/blog/33-release/68b69954-9df2-48b2-bd63-fe07ba8cb25b.png create mode 100644 static/imgs/blog/33-release/78d6744b-928a-41d4-857c-ff91ad69c896.png create mode 100644 static/imgs/blog/33-release/7e4f3ced-9932-472f-bb8f-272ec97a7fbe.png create mode 100644 static/imgs/blog/33-release/c7d4f983-f619-4d39-94b6-5d62fd5a430e.png create mode 100644 static/imgs/blog/33-release/ee5812e0-a90b-4a02-abab-b658cdddefc1.png
(dubbo-website) branch history/next updated (4bf72710e12 -> 69269ed1cbf)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch history/next
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
from 4bf72710e12 Fix link
add 69269ed1cbf Fix link
No new revisions were added by this update.
Summary of changes:
.../how-to-proxy-dubbo-in-apache-apisix.md | 2 +-
.../java/proposals/service-discovery-migration.md | 2 +
.../java/proposals/service-discovery-rule.md} | Bin 9450 -> 9461 bytes
.../java/proposals/service-discovery-samples.md| 87 +
.../reference-manual/qos/introduction/probe.md | 7 --
.../migration-service-discovery.md | 3 -
6 files changed, 90 insertions(+), 11 deletions(-)
copy content/zh-cn/{docs/advanced/migration-invoker.md =>
blog/java/proposals/service-discovery-rule.md} (96%)
create mode 100644
content/zh-cn/blog/java/proposals/service-discovery-samples.md
(dubbo-website) branch history/next updated (606a5031ce5 -> 4bf72710e12)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 606a5031ce5 Fix link add 4bf72710e12 Fix link No new revisions were added by this update. Summary of changes: .../advanced-features-and-usage/others/dubbo-kubernetes-probe.md | 8 .../advanced-features-and-usage/others/logger-management.md | 4 ++-- .../advanced-features-and-usage/others/service-container.md | 4 ++-- .../advanced-features-and-usage/performance/loadbalance.md| 4 ++-- .../java-sdk/advanced-features-and-usage/performance/profiler.md | 4 ++-- .../advanced-features-and-usage/performance/result-cache.md | 4 ++-- .../advanced-features-and-usage/performance/router-snapshot.md| 4 ++-- .../service/fault-tolerent-strategy.md| 4 ++-- .../java-sdk/advanced-features-and-usage/service/group-merger.md | 4 ++-- .../advanced-features-and-usage/service/multi-registry.md | 2 +- .../advanced-features-and-usage/service/parameter-validation.md | 2 +- .../mannual/java-sdk/tasks/deploy/deploy-on-kubernetes-service.md | 6 +++--- .../mannual/java-sdk/tasks/framework/more/concurrency-control.md | 2 +- .../mannual/java-sdk/tasks/framework/more/config-connections.md | 2 +- .../mannual/java-sdk/tasks/framework/more/parameter-validation.md | 2 +- .../mannual/java-sdk/tasks/framework/more/result-cache.md | 2 +- .../mannual/java-sdk/tasks/framework/more/router-snapshot.md | 4 ++-- .../overview/mannual/java-sdk/tasks/framework/version_group.md| 2 +- content/zh-cn/overview/mannual/java-sdk/tasks/protocols/rest.md | 4 ++-- .../overview/mannual/java-sdk/tasks/troubleshoot/profiler.md | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-)
(dubbo-website) branch history/next updated (b9c62b6b510 -> 1c71556de40)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from b9c62b6b510 Fix links add 1c71556de40 Fix actions No new revisions were added by this update. Summary of changes: .github/workflows/link_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo-website) branch history/next updated (f6d9e2e3f52 -> c8d7289cb32)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from f6d9e2e3f52 Fix links add c8d7289cb32 Fix links No new revisions were added by this update. Summary of changes: .../reference-manual/upgrades-and-compatibility/migration-triple.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(dubbo-website) branch history/next updated (9331ee3a17e -> 494f2420a26)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch history/next in repository https://gitbox.apache.org/repos/asf/dubbo-website.git from 9331ee3a17e Add json and security docs for Rest add 494f2420a26 Fix links No new revisions were added by this update. Summary of changes: content/zh-cn/overview/mannual/java-sdk/_index.md | 6 +++--- .../zh-cn/overview/mannual/java-sdk/reference-manual/faq/intro.md | 1 + .../mannual/java-sdk/reference-manual/graalvm/support-graalvm.md| 1 + .../java-sdk/reference-manual/serialization/dubbo/fastjson.md | 4 ++-- .../java-sdk/reference-manual/serialization/triple/protobuf.md | 3 +-- content/zh-cn/overview/mannual/java-sdk/tasks/security/tls.md | 1 + .../overview/mannual/java-sdk/tasks/traffic-management/_index.md| 2 +- 7 files changed, 10 insertions(+), 8 deletions(-)
svn commit: r71389 - in /dev/dubbo/dubbo: 3.2.16/ 3.2.16/apache-dubbo-3.2.16.zip 3.2.16/apache-dubbo-3.2.16.zip.asc 3.2.16/apache-dubbo-3.2.16.zip.sha512 3.3.0-beta.5/
Author: albumenj Date: Sat Sep 7 09:56:50 2024 New Revision: 71389 Log: Release Apache Dubbo 3.2.16 RC1 Added: dev/dubbo/dubbo/3.2.16/ dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip (with props) dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 Removed: dev/dubbo/dubbo/3.3.0-beta.5/ Added: dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc == --- dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc (added) +++ dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.asc Sat Sep 7 09:56:50 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEFcfFqQs6t3A0GIYZEkta3Ssknt0FAmbcIzAACgkQEkta3Ssk +nt3oSBAAidcokzykq5BPx6qhREONZW6/CgKvUIaEYsRifAmgnc5u1fISab/F8u4U +XlkHwBn3kMORyedIkzOJku2RGS2b36g7VjxVKLeaPZkXb0+whuuu2E/9yjU6LKnd +uJUVczrwWDKVlgtbMSLw8abN8ZhqdFVpgl5wHuLpvidnnLnL75fjNbnTuGYPFP35 +CyhCIEDCXn/Lk++/n2k6nIvi+Cl/O/7XmloH7zYSXWAlkOE2g0g/ebT3UxKXzMSU +y8bWNYcca0qWNapYpBajj5tEzXJLjKqdTqwaHkNvwAiG42Y9xBNA+PRaAxR9k5tj +6qJVH5xKKAR9cUPIepwAN2UjklVW2BKFNPxpkjaKynEUiIbv/ebXV1zc5Tsg/2/G +qLdo8c+uZY7wgr/PHrff7yyPd5Yb9VTCUsuTNAlGwA8F+notF+3cdTNgNDNzpuT5 +LNXF9ad15v3OfNvhHAHBHSwmbfdsDveqYqoC8YkEbjC73axKn04rsWc83E+dIjv5 +Juc4wNRYVX/7Ygeg11iJ/NNLGpmLynEHCOrxvibla45Lb5JDWGKcHHUhpAevWoGe +lwNIVTJI8ZMQJRGnqSpqaMBT8IWla83epVi/EUTttDRJt836susRBi8C0HObbZyi +jlAl5kB9guyt1mfYrGSo1S/Tw1ctRDzC1SLazBbt6cJvDf3etyc= +=pfYb +-END PGP SIGNATURE- Added: dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 == --- dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 (added) +++ dev/dubbo/dubbo/3.2.16/apache-dubbo-3.2.16.zip.sha512 Sat Sep 7 09:56:50 2024 @@ -0,0 +1 @@ +29cebcd8263251141144a00916158768dd3b94d97584d627edb2d1c9205d30280ca7f9916d901582099db3be16ad038e5b03e2aa400a4ba31a7e223b1d954724 apache-dubbo-3.2.16.zip
(dubbo) branch revert-14285-3.2-zk-service-ensemble-tracker deleted (was 148e2f9ba5)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch revert-14285-3.2-zk-service-ensemble-tracker in repository https://gitbox.apache.org/repos/asf/dubbo.git was 148e2f9ba5 Revert "fix: Support disable Curator EnsembleTracker in ServiceDiscovery (#14…" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(dubbo) 01/01: Prepare 3.3.0 release
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3.0-release in repository https://gitbox.apache.org/repos/asf/dubbo.git commit aa20c9bc41d952cce842f8fc1cae6b9bb711ae2e Author: Albumen Kevin AuthorDate: Sat Sep 7 15:25:28 2024 +0800 Prepare 3.3.0 release --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 6bbdf4f855..d30bb2b6f6 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -187,7 +187,7 @@ 4.0.1 2.3.3-b02 -3.3.0-beta.6-SNAPSHOT +3.3.0 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 17dd404eb3..1c2c97cc4c 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -39,7 +39,7 @@ 1.0.0 2.38.0 -3.3.0-beta.6-SNAPSHOT +3.3.0 diff --git a/pom.xml b/pom.xml index 2d90f26c07..4f998762cb 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ check 1.0.0 2.38.0 -3.3.0-beta.6-SNAPSHOT +3.3.0
(dubbo) 01/01: Merge branch 'refs/heads/apache-3.2' into apache-3.3
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 1fb4dc82253c4b1d965187b51106e3bc57ce422c Merge: a25b21facd 08c74b79d2 Author: Albumen Kevin AuthorDate: Sat Sep 7 15:34:40 2024 +0800 Merge branch 'refs/heads/apache-3.2' into apache-3.3 # Conflicts: # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleServerStream.java .github/ISSUE_TEMPLATE/1-bug.yml | 1 + .github/ISSUE_TEMPLATE/2-feature.yml | 1 + .../boot/observability/autoconfigure/brave/BraveAutoConfiguration.java | 1 + 3 files changed, 3 insertions(+)
(dubbo) tag dubbo-3.2.16 created (now c2894d112b)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to tag dubbo-3.2.16 in repository https://gitbox.apache.org/repos/asf/dubbo.git at c2894d112b (commit) No new revisions were added by this update.
(dubbo) branch 3.2.16-release updated (4a7489739c -> c2894d112b)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2.16-release in repository https://gitbox.apache.org/repos/asf/dubbo.git from 4a7489739c Prepare 3.2.16 release add 08c74b79d2 Close stream when channel was inactive (#14643) new c2894d112b Merge branch 'refs/heads/apache-3.2' into 3.2.16-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: .../org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java | 8 .../org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java| 2 ++ .../apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java | 5 + .../apache/dubbo/rpc/protocol/tri/stream/TripleServerStream.java | 8 .../dubbo/rpc/protocol/tri/transport/H2TransportListener.java | 2 ++ .../protocol/tri/transport/TripleHttp2ClientResponseHandler.java | 1 + .../dubbo/rpc/protocol/tri/stream/MockClientStreamListener.java | 3 +++ .../protocol/tri/transport/AbstractH2TransportListenerTest.java | 3 +++ 8 files changed, 32 insertions(+)
(dubbo) 01/01: Merge branch 'refs/heads/apache-3.2' into 3.2.16-release
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2.16-release in repository https://gitbox.apache.org/repos/asf/dubbo.git commit c2894d112b0657e3f07d46e2a2ea397853df1e88 Merge: 4a7489739c 08c74b79d2 Author: Albumen Kevin AuthorDate: Sat Sep 7 15:23:31 2024 +0800 Merge branch 'refs/heads/apache-3.2' into 3.2.16-release .../org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java | 8 .../org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java| 2 ++ .../apache/dubbo/rpc/protocol/tri/stream/TripleClientStream.java | 5 + .../apache/dubbo/rpc/protocol/tri/stream/TripleServerStream.java | 8 .../dubbo/rpc/protocol/tri/transport/H2TransportListener.java | 2 ++ .../protocol/tri/transport/TripleHttp2ClientResponseHandler.java | 1 + .../dubbo/rpc/protocol/tri/stream/MockClientStreamListener.java | 3 +++ .../protocol/tri/transport/AbstractH2TransportListenerTest.java | 3 +++ 8 files changed, 32 insertions(+)
(dubbo) branch 3.3 updated: Support basic auth (#14644)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new a25b21facd Support basic auth (#14644)
a25b21facd is described below
commit a25b21facd6ad74a4116424a74c8a0baf7a80d18
Author: Albumen Kevin
AuthorDate: Sat Sep 7 09:11:08 2024 +0800
Support basic auth (#14644)
* Support basic auth
* Fix sd
* Use trie
* Fix ut
* Fix ut
* Fix ut
---
.../dubbo/config/AbstractInterfaceConfig.java | 42 ++
.../apache/dubbo/auth/AccessKeyAuthenticator.java | 14 ++--
.../org/apache/dubbo/auth/BasicAuthenticator.java | 53 +
.../main/java/org/apache/dubbo/auth/Constants.java | 17 +++-
.../dubbo/auth/filter/ConsumerSignFilter.java | 16 ++--
.../dubbo/auth/filter/ProviderAuthFilter.java | 19 +++--
.../auth/filter/ProviderAuthHeaderFilter.java | 64 +++
.../apache/dubbo/auth/spi/AccessKeyStorage.java| 3 +-
.../org/apache/dubbo/auth/spi/Authenticator.java | 3 +-
.../org.apache.dubbo.auth.spi.Authenticator| 3 +-
.../internal/org.apache.dubbo.rpc.HeaderFilter | 1 +
.../dubbo/auth/AccessKeyAuthenticatorTest.java | 29 +--
.../dubbo/auth/filter/ConsumerSignFilterTest.java | 9 ++-
.../dubbo/auth/filter/ProviderAuthFilterTest.java | 36 +
.../registry/client/metadata/MetadataUtils.java| 23 ++
.../registry/integration/RegistryProtocol.java | 34 +++-
.../main/java/org/apache/dubbo/rpc/Constants.java | 5 +-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 74 +
.../org/apache/dubbo/rpc/support/TrieTree.java | 92 ++
.../org/apache/dubbo/rpc/support/TrieTreeTest.java | 63 +++
.../java/org/apache/dubbo/rpc/TriRpcStatus.java| 4 +
.../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 61 --
.../dubbo/rpc/protocol/tri/TripleProtocol.java | 3 -
23 files changed, 510 insertions(+), 158 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 4dd3503472..1015f124a3 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -206,6 +206,21 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
*/
private Boolean auth;
+/**
+ * Authenticator for authentication
+ */
+private String authenticator;
+
+/**
+ * Username for basic authenticator
+ */
+private String username;
+
+/**
+ * Password for basic authenticator
+ */
+private String password;
+
/**
* Use separate instances for services with the same serviceKey (applies
when using ReferenceConfig and SimpleReferenceCache together).
* Directly calling ReferenceConfig.get() will not check this attribute.
@@ -892,6 +907,33 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
this.auth = auth;
}
+public String getAuthenticator() {
+return authenticator;
+}
+
+public AbstractInterfaceConfig setAuthenticator(String authenticator) {
+this.authenticator = authenticator;
+return this;
+}
+
+public String getUsername() {
+return username;
+}
+
+public AbstractInterfaceConfig setUsername(String username) {
+this.username = username;
+return this;
+}
+
+public String getPassword() {
+return password;
+}
+
+public AbstractInterfaceConfig setPassword(String password) {
+this.password = password;
+return this;
+}
+
public SslConfig getSslConfig() {
return getConfigManager().getSsl().orElse(null);
}
diff --git
a/dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/AccessKeyAuthenticator.java
b/dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/AccessKeyAuthenticator.java
index 0b642b5e61..ce5d20aff9 100644
---
a/dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/AccessKeyAuthenticator.java
+++
b/dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/AccessKeyAuthenticator.java
@@ -26,14 +26,14 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.Invocation;
-import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.support.RpcUtils;
public class AccessKeyAuthenticator implements Authenticator {
-private final ApplicationModel applicationModel;
+private final FrameworkModel
(dubbo) branch 3.3 updated: Close stream when channel was inactive (#14641)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 01299904bb Close stream when channel was inactive (#14641)
01299904bb is described below
commit 01299904bbcb48797048d0d41f8b16e33e092340
Author: TomlongTK
AuthorDate: Fri Sep 6 23:23:38 2024 +0800
Close stream when channel was inactive (#14641)
* Close stream when channel was inactive
* Do onClose in stream executor
refine
-
Co-authored-by: Albumen Kevin
---
.../org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java | 8
.../rpc/protocol/tri/h3/negotiation/NegotiateClientCall.java | 9 +
.../rpc/protocol/tri/stream/AbstractTripleClientStream.java | 5 +
.../org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java | 2 ++
.../dubbo/rpc/protocol/tri/transport/H2TransportListener.java| 2 ++
.../protocol/tri/transport/TripleHttp2ClientResponseHandler.java | 1 +
.../dubbo/rpc/protocol/tri/stream/MockClientStreamListener.java | 3 +++
.../protocol/tri/transport/AbstractH2TransportListenerTest.java | 3 +++
8 files changed, 33 insertions(+)
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java
index 7c983c29d5..9965191497 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java
@@ -135,6 +135,14 @@ public class TripleClientCall implements ClientCall,
ClientStream.Listener {
}
}
+@Override
+public void onClose() {
+if (done) {
+return;
+}
+onCancelByRemote(TriRpcStatus.CANCELLED);
+}
+
@Override
public void onStart() {
listener.onStart(this);
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h3/negotiation/NegotiateClientCall.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h3/negotiation/NegotiateClientCall.java
index 309301348c..54db142391 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h3/negotiation/NegotiateClientCall.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h3/negotiation/NegotiateClientCall.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.remoting.api.connection.AbstractConnectionClient;
import org.apache.dubbo.remoting.http12.HttpHeaderNames;
+import org.apache.dubbo.rpc.TriRpcStatus;
import org.apache.dubbo.rpc.protocol.tri.TripleConstants;
import org.apache.dubbo.rpc.protocol.tri.TripleHeaderEnum;
import org.apache.dubbo.rpc.protocol.tri.transport.H2TransportListener;
@@ -133,5 +134,13 @@ public class NegotiateClientCall {
public void cancelByRemote(long errorCode) {
executor.execute(() -> future.completeExceptionally(new
RuntimeException("Canceled by remote")));
}
+
+@Override
+public void onClose() {
+if (future.isDone()) {
+return;
+}
+cancelByRemote(TriRpcStatus.CANCELLED.code.code);
+}
}
}
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/AbstractTripleClientStream.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/AbstractTripleClientStream.java
index ae50b9427d..036739f019 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/AbstractTripleClientStream.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/AbstractTripleClientStream.java
@@ -453,5 +453,10 @@ public abstract class AbstractTripleClientStream extends
AbstractStream implemen
finishProcess(transportError, null, false);
});
}
+
+@Override
+public void onClose() {
+executor.execute(listener::onClose);
+}
}
}
diff --git
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java
index 178a9f310e..94bff9865d 100644
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/ClientStream.java
@@ -56,6 +56,8 @@ public interface ClientStream extends Stream {
(dubbo) branch 3.3 updated: Support no interface (#14639)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new ca6909a497 Support no interface (#14639)
ca6909a497 is described below
commit ca6909a497666d03be250cae3fc9c8f789ec51cb
Author: Sean Yang
AuthorDate: Fri Sep 6 16:41:50 2024 +0800
Support no interface (#14639)
Co-authored-by: Albumen Kevin
---
.../dubbo/config/AbstractInterfaceConfig.java | 12 ++--
.../apache/dubbo/config/AbstractServiceConfig.java | 4 +--
.../org/apache/dubbo/config/ServiceConfigBase.java | 35 --
.../org/apache/dubbo/config/ServiceConfigTest.java | 14 +
.../org/apache/dubbo/config/url/UrlTestBase.java | 2 +-
.../config/spring/util/DubboAnnotationUtils.java | 4 ++-
.../tri/h12/AbstractServerTransportListener.java | 8 +
7 files changed, 43 insertions(+), 36 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 368f8f56ec..4dd3503472 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -313,9 +313,7 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
return;
}
-if (!interfaceClass.isInterface() && !canSkipInterfaceCheck()) {
-throw new IllegalStateException(interfaceName + " is not an
interface");
-}
+checkInterface();
// Auto create MethodConfig/ArgumentConfig according to config
props
Map configProperties =
subPropsConfiguration.getProperties();
@@ -377,13 +375,9 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
/**
* it is used for skipping the check of interface since dubbo 3.2
- * rest protocol allow the service is implement class
- *
- * @return
+ * rest and triple protocol allow the service is implement class
*/
-protected boolean canSkipInterfaceCheck() {
-return false;
-}
+protected void checkInterface() {}
protected boolean verifyMethodConfig(
MethodConfig methodConfig, Class interfaceClass, boolean
ignoreInvalidMethodConfig) {
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
index 9965ffe6c1..dbd83e84c3 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
@@ -23,7 +23,7 @@ import org.apache.dubbo.rpc.model.ModuleModel;
import java.beans.Transient;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executor;
@@ -281,7 +281,7 @@ public abstract class AbstractServiceConfig extends
AbstractInterfaceConfig {
}
public void setProtocol(ProtocolConfig protocol) {
-setProtocols(new ArrayList<>(Arrays.asList(protocol)));
+setProtocols(new ArrayList<>(Collections.singletonList(protocol)));
}
@Parameter(excluded = true)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
index a78ea257a9..f9fc435fe6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
@@ -48,6 +48,7 @@ import static
org.apache.dubbo.common.constants.CommonConstants.DUBBO;
*
* @export
*/
+@SuppressWarnings({"rawtypes", "deprecation"})
public abstract class ServiceConfigBase extends AbstractServiceConfig {
private static final long serialVersionUID = 3033787999037024738L;
@@ -109,6 +110,12 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
setMethods(MethodConfig.constructMethodConfig(service.methods()));
}
+@Override
+public void setProtocols(List protocols) {
+super.setProtocols(protocols);
+checkInterface();
+}
+
@Override
protected void postProcessAfterScopeModelChanged(ScopeModel oldScopeModel,
ScopeModel newScopeModel) {
super.postProcessAfterScopeModelChanged(oldScopeModel, newScopeModel);
@@ -215,7 +222,7 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
}
protected void completeCompoundConfigs() {
-super.completeCompoundConfigs(provider);
+completeCompoundConfigs(provider)
(dubbo-integration-cases) branch main updated: Import jdk serialization by spi (#40)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git The following commit(s) were added to refs/heads/main by this push: new d405af06 Import jdk serialization by spi (#40) d405af06 is described below commit d405af061e3094e6fc272a64ebba8144957e9d56 Author: Albumen Kevin AuthorDate: Fri Sep 6 15:39:05 2024 +0800 Import jdk serialization by spi (#40) --- .../case-versions.conf | 2 +- .../case-configuration.yml | 48 .../case-versions.conf | 2 +- .../pom.xml| 31 +++ .../prefer/serialization/api/DemoService.java | 22 ++ .../pom.xml| 6 +- .../java/org/apache/dubbo/samples/FakeMain.java| 23 ++ .../samples/prefer/serialization/ConsumerIT.java | 251 +++ .../prefer/serialization/SerializationWrapper.java | 71 ++ ...org.apache.dubbo.common.serialize.Serialization | 1 + .../src/test/resources/log4j2-test.xml | 29 +++ .../pom.xml| 6 +- .../prefer/serialization/DemoServiceImpl.java | 26 ++ .../prefer/serialization/DubboProvider.java| 268 + .../src/main/resources/log4j2.xml | 29 +++ .../pom.xml| 10 +- .../case-versions.conf | 2 +- .../pom.xml| 5 + .../pom.xml| 5 + .../pom.xml| 9 +- 99-integration/dubbo-samples-test-13441-3/pom.xml | 2 +- 99-integration/dubbo-samples-test-13441-4/pom.xml | 2 +- 99-integration/dubbo-samples-test-13441-5/pom.xml | 2 +- 99-integration/dubbo-samples-test-13441-6/pom.xml | 2 +- 99-integration/dubbo-samples-test-13441-7/pom.xml | 2 +- 99-integration/pom.xml | 1 + 26 files changed, 837 insertions(+), 20 deletions(-) diff --git a/99-integration/dubbo-samples-prefer-serialization-test-31x/case-versions.conf b/99-integration/dubbo-samples-prefer-serialization-test-31x/case-versions.conf index 1a75dd09..1f6c26a6 100644 --- a/99-integration/dubbo-samples-prefer-serialization-test-31x/case-versions.conf +++ b/99-integration/dubbo-samples-prefer-serialization-test-31x/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.2.0 ] +dubbo.version= 3.2* spring.version=4.*, 5.* java.version= [<= 11] diff --git a/99-integration/dubbo-samples-prefer-serialization-test-32x/case-configuration.yml b/99-integration/dubbo-samples-prefer-serialization-test-32x/case-configuration.yml new file mode 100644 index ..2b7bbe9c --- /dev/null +++ b/99-integration/dubbo-samples-prefer-serialization-test-32x/case-configuration.yml @@ -0,0 +1,48 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +services: + zookeeper: +image: zookeeper:latest + + dubbo-samples-prefer-serialization-test-32x-provider: +type: app +basedir: dubbo-samples-prefer-serialization-test-32x-provider +mainClass: org.apache.dubbo.samples.prefer.serialization.DubboProvider +systemProps: + - zookeeper.address=zookeeper +waitPortsBeforeRun: + - zookeeper:2181 +checkPorts: + - 20880 +checkLog: "dubbo service started" +depends_on: + - zookeeper + + dubbo-samples-prefer-serialization-test-32x-consumer: +type: test +basedir: dubbo-samples-prefer-serialization-test-32x-consumer +tests: + - "**/*IT.class" +systemProps: + - zookeeper.address=zookeeper +waitPortsBeforeRun: + - zookeeper:2181 + - dubbo-samples-prefer-serialization-test-32x-provider:20880 +depends_on: + - zookeeper + - dubbo-samples-prefer-serialization-test-32x-provider diff --git a/99-integration/dubbo-samples-prefer-serialization-test/case-versions.conf b/99-integration/dubbo-samples-pr
(dubbo) branch 3.3 updated: [Task] move jdk-ser to spi-extensions (#14369)
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
The following commit(s) were added to refs/heads/3.3 by this push:
new 96bf731971 [Task] move jdk-ser to spi-extensions (#14369)
96bf731971 is described below
commit 96bf73197125f81d14f9fa2c75e330d04f1140f6
Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com>
AuthorDate: Fri Sep 6 10:44:13 2024 +0800
[Task] move jdk-ser to spi-extensions (#14369)
* first commit
* temp
---
.artifacts | 1 -
dubbo-config/dubbo-config-api/pom.xml | 7 --
.../apache/dubbo/config/AbstractConfigTest.java| 2 +-
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml| 5 -
.../dubbo-demo-spring-mvc-rest-provider/pom.xml| 5 -
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 5 -
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 5 -
dubbo-distribution/dubbo-all-shaded/pom.xml| 8 --
dubbo-distribution/dubbo-all/pom.xml | 8 --
dubbo-distribution/dubbo-bom/pom.xml | 5 -
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 6 --
.../dubbo-serialization-jdk/pom.xml| 44
.../serialize/java/CompactedJavaSerialization.java | 58 --
.../serialize/java/CompactedObjectInputStream.java | 63 ---
.../java/CompactedObjectOutputStream.java | 43
.../common/serialize/java/JavaObjectInput.java | 89
.../common/serialize/java/JavaObjectOutput.java| 61 ---
.../common/serialize/java/JavaSerialization.java | 82 ---
.../nativejava/NativeJavaObjectInput.java | 117 -
.../nativejava/NativeJavaObjectOutput.java | 114
.../nativejava/NativeJavaSerialization.java| 83 ---
...org.apache.dubbo.common.serialize.Serialization | 3 -
dubbo-serialization/pom.xml| 1 -
dubbo-test/dubbo-dependencies-all/pom.xml | 5 -
dubbo-test/dubbo-test-spring/pom.xml | 5 -
25 files changed, 1 insertion(+), 824 deletions(-)
diff --git a/.artifacts b/.artifacts
index 2c21cd0bca..92f7a1615c 100644
--- a/.artifacts
+++ b/.artifacts
@@ -88,7 +88,6 @@ dubbo-serialization
dubbo-serialization-api
dubbo-serialization-fastjson2
dubbo-serialization-hessian2
-dubbo-serialization-jdk
dubbo-spring-boot
dubbo-spring-boot-actuator
dubbo-spring-boot-actuator-compatible
diff --git a/dubbo-config/dubbo-config-api/pom.xml
b/dubbo-config/dubbo-config-api/pom.xml
index dbccd5841c..3a29c6c757 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -145,13 +145,6 @@
test
-
- org.apache.dubbo
- dubbo-serialization-jdk
- ${project.parent.version}
- test
-
-
org.apache.dubbo
dubbo-registry-multicast
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
index 963e44eb28..599b55e78f 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -77,7 +77,7 @@ class AbstractConfigTest {
protocolConfig.setName("dubbo");
protocolConfig.setHost("host");
protocolConfig.setSerialization("fastjson2");
-
protocolConfig.setPreferSerialization("hessian2,java,compactedjava,nativejava");
+protocolConfig.setPreferSerialization("hessian2");
ConfigValidationUtils.validateProtocolConfig(protocolConfig);
}
diff --git
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml
index e0c96b82fe..46cafa0047 100644
--- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml
+++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml
@@ -108,11 +108,6 @@
dubbo-serialization-fastjson2
${project.version}
-
- org.apache.dubbo
- dubbo-serialization-jdk
- ${project.version}
-
org.springframework
diff --git
a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml
b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml
index b9320cc504..aba2a7387a 100644
--- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml
+++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml
@@ -108,11 +108,6 @@
dubbo-serialization-fastjson2
${project.version}
-
- org.apache.dubbo
(dubbo-spi-extensions) branch 3.3 updated: replace (#510)
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-spi-extensions.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 7bb7234f replace (#510)
7bb7234f is described below
commit 7bb7234f9d7af7c7702f93e42ed945c13382a317
Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com>
AuthorDate: Fri Sep 6 10:42:22 2024 +0800
replace (#510)
---
dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml | 2 +-
dubbo-extensions-dependencies-bom/pom.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
index 56995e9a..343c2541 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
@@ -103,7 +103,7 @@
org.apache.dubbo
-dubbo-dependencies-zookeeper
+dubbo-dependencies-zookeeper-curator5
pom
diff --git a/dubbo-extensions-dependencies-bom/pom.xml
b/dubbo-extensions-dependencies-bom/pom.xml
index d24c6f7d..afe33b2b 100644
--- a/dubbo-extensions-dependencies-bom/pom.xml
+++ b/dubbo-extensions-dependencies-bom/pom.xml
@@ -186,7 +186,7 @@
org.apache.dubbo
-dubbo-dependencies-zookeeper
+dubbo-dependencies-zookeeper-curator5
${dubbo.version}
pom
import
(dubbo-spi-samples) branch main updated: fix static errors (#16)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-samples.git
The following commit(s) were added to refs/heads/main by this push:
new b098aa7 fix static errors (#16)
b098aa7 is described below
commit b098aa779ab548d65abe654f0534177f5e4bb0a5
Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com>
AuthorDate: Fri Sep 6 10:38:08 2024 +0800
fix static errors (#16)
---
.../samples-spi-loadbalance/samples-spi-loadbalance-peakewma/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/7-dubbo-spi-loadbalance-samples/samples-spi-loadbalance/samples-spi-loadbalance-peakewma/pom.xml
b/7-dubbo-spi-loadbalance-samples/samples-spi-loadbalance/samples-spi-loadbalance-peakewma/pom.xml
index 5f39a1c..a68daa0 100644
---
a/7-dubbo-spi-loadbalance-samples/samples-spi-loadbalance/samples-spi-loadbalance-peakewma/pom.xml
+++
b/7-dubbo-spi-loadbalance-samples/samples-spi-loadbalance/samples-spi-loadbalance-peakewma/pom.xml
@@ -30,8 +30,8 @@
1.0-SNAPSHOT
-1.8
-1.8
+1.8
+1.8
3.8.4
UTF-8
@@ -97,6 +97,7 @@
org.springframework
spring-context-support
+${spring.version}
(dubbo) branch 3.2.16-release created (now 4a7489739c)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch 3.2.16-release in repository https://gitbox.apache.org/repos/asf/dubbo.git at 4a7489739c Prepare 3.2.16 release This branch includes the following new commits: new 4a7489739c Prepare 3.2.16 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.
(dubbo) 01/01: Prepare 3.2.16 release
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2.16-release in repository https://gitbox.apache.org/repos/asf/dubbo.git commit 4a7489739c58c20da8987f5d27fe025d13cacb2f Author: Albumen Kevin AuthorDate: Fri Sep 6 09:41:17 2024 +0800 Prepare 3.2.16 release --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 0af619f3ab..27ffd0f734 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -170,7 +170,7 @@ check 1.0.0 2.38.0 -3.2.16-SNAPSHOT +3.2.16 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index f769cf5c61..51d8440c42 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -31,7 +31,7 @@ pom -3.2.16-SNAPSHOT +3.2.16 1.6.0 5.1.0 3.8.4 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 47bdb232ea..c2bef3b8f5 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -31,7 +31,7 @@ pom -3.2.16-SNAPSHOT +3.2.16 1.6.0 4.3.0 3.4.14 diff --git a/pom.xml b/pom.xml index 59ea9aae46..9e5c273deb 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ check 1.0.0 2.38.0 -3.2.16-SNAPSHOT +3.2.16
(dubbo) branch 3.2 updated: Update BraveAutoConfiguration.java (#14631)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new ac6704d532 Update BraveAutoConfiguration.java (#14631)
ac6704d532 is described below
commit ac6704d532ca814dbf989dd20ea31716eabc6990
Author: The True HOOHA <2722...@qq.com>
AuthorDate: Fri Sep 6 09:37:18 2024 +0800
Update BraveAutoConfiguration.java (#14631)
The bean 'correlationFieldsCorrelationScopeCustomizer', defined in class
path resource
[org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration$BraveBaggageConfiguration.class],
could not be registered. A bean with that name has already been defined in
class path resource
[org/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations$PropagationWithBaggage.class]
and overriding is disabled.
---
.../boot/observability/autoconfigure/brave/BraveAutoConfiguration.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
index b3134e7576..b80166c0dd 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
@@ -272,6 +272,7 @@ public class BraveAutoConfiguration {
prefix = ObservabilityUtils.DUBBO_TRACING_BAGGAGE_CORRELATION,
name = "enabled",
matchIfMissing = true)
+@ConditionalOnMissingBean
brave.baggage.CorrelationScopeCustomizer
correlationFieldsCorrelationScopeCustomizer() {
return (builder) -> {
List correlationFields = this.dubboConfigProperties
