(dubbo) 01/01: Merge branch '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 598511658203ca45b7f96874b6d948582d2f3cb4
Merge: 2486674828 b9825cdbd0
Author: Albumen Kevin
AuthorDate: Mon Jun 17 10:00:57 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#
dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
# dubbo-dependencies-bom/pom.xml
# dubbo-native-plugin/pom.xml
# dubbo-spring-boot/pom.xml
.../main/java/org/apache/dubbo/common/Version.java | 8 +++--
.../dubbo/common/constants/CommonConstants.java| 40 +++---
.../main/resources/security/serialize.blockedlist | 3 +-
.../apache/dubbo/common/version/VersionTest.java | 9 +++--
dubbo-dependencies-bom/pom.xml | 6 ++--
dubbo-maven-plugin/pom.xml | 6 ++--
.../dubbo/reactive/calls/ReactorServerCalls.java | 8 ++---
.../zookeeper/util/CuratorFrameworkUtils.java | 3 ++
.../curator5/AbstractZookeeperClient.java | 1 +
.../curator5/Curator5ZookeeperClient.java | 3 ++
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 2 +-
.../autoconfigure/exporter/zipkin/HttpSender.java | 6 ++--
.../exporter/zipkin/ZipkinConfigurations.java | 2 +-
.../exporter/zipkin/ZipkinRestTemplateSender.java | 4 +--
.../exporter/zipkin/ZipkinWebClientSender.java | 4 +--
.../observability/pom.xml | 6 ++--
dubbo-spring-boot/pom.xml | 2 +-
.../java/org/apache/dubbo/dependency/FileTest.java | 4 ++-
pom.xml| 12 +++
19 files changed, 84 insertions(+), 45 deletions(-)
diff --cc
dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 92b46c77f5,704b30c74c..61537707e3
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@@ -279,13 -286,19 +282,21 @@@ public interface CommonConstants
int MAX_PROXY_COUNT = 65535;
String MONITOR_KEY = "monitor";
+
String BACKGROUND_KEY = "background";
+
String CLUSTER_KEY = "cluster";
+
+String MERGEABLE_CLUSTER_NAME = "mergeable";
++
String USERNAME_KEY = "username";
+
String PASSWORD_KEY = "password";
+
String HOST_KEY = "host";
+
String PORT_KEY = "port";
+
String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
/**
@@@ -575,12 -634,25 +595,20 @@@
String SERVICE_EXECUTOR = "service-executor";
String EXECUTOR_MANAGEMENT_MODE = "executor-management-mode";
+
String EXECUTOR_MANAGEMENT_MODE_DEFAULT = "default";
+
String EXECUTOR_MANAGEMENT_MODE_ISOLATION = "isolation";
+ /**
+ * used in JVMUtil.java ,Control stack print lines, default is 32 lines
+ */
+ String DUBBO_JSTACK_MAXLINE = "dubbo.jstack-dump.max-line";
+
String ENCODE_IN_IO_THREAD_KEY = "encode.in.io";
+
boolean DEFAULT_ENCODE_IN_IO_THREAD = false;
-/**
- * @since 3.2.0
- */
-String BYTE_ACCESSOR_KEY = "byte.accessor";
-
String PAYLOAD = "payload";
String DUBBO_METRICS_CONFIGCENTER_ENABLE =
"dubbo.metrics.configcenter.enable";
@@@ -591,161 -663,11 +619,165 @@@
String DUBBO_PACKABLE_METHOD_FACTORY = "dubbo.application.parameters." +
PACKABLE_METHOD_FACTORY_KEY;
-String DUBBO_MANUAL_REGISTER_KEY = "dubbo.application.manual-register";
+String DUBBO_TAG_HEADER = "dubbo-tag";
+
+String REST_SERVICE_DEPLOYER_URL_ATTRIBUTE_KEY =
"restServiceDeployerAttributeKey";
-String DUBBO2_COMPACT_ENABLE = "dubbo.compact.enable";
+String POD_NAMESPACE = "POD_NAMESPACE";
+
+String CLUSTER_DOMAIN = "CLUSTER_DOMAIN";
+
+String EXT_PROTOCOL = "ext.protocol";
+
+String IS_EXTRA = "isExtra";
+ String ZOOKEEPER_ENSEMBLE_TRACKER_KEY = "zookeeper.ensemble.tracker";
+
+ String DUBBO_VERSIONS_KEY = "META-INF/dubbo-versions";
++
+/**
+ * System-related VM properties
+ */
+interface SystemProperty {
+
+String USER_HOME = "user.home";
+
+String SYSTEM_JAVA_VERSION = "java.version";
+
+String SYSTEM_JAVA_IO_TMPDIR = "java.io.tmpdir";
+
+String SYSTEM_LINE_SEPARATOR = "line.separator";
+
+String SERIALIZATION_SECURITY_CHECK_KEY =
"serialization.security.check";
+
+String SYSTEM_BYTE_ACCESSOR_KEY = "byte.accessor";
+
+String SYSTEM_OS_NAME = "os.name";
+
+String SYSTEM_OS_VERSION = "os.version";
+
+String JAVA_RUNTIME_NAME = "java.runtime.name";
+
+String JAVA_RUNTIME_VERSION = "java.runtime.version";
+
+String JAVA_VM_NAME = "java.vm.name";
+
+String JAVA_VM_VERSION = "java.vm.vers
(dubbo) 01/01: Merge branch '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 32f4cb53df24b59af3ee6931d2d51a93b2f9dd1f
Merge: 6f1a41f125 23599941e7
Author: Albumen Kevin
AuthorDate: Fri May 24 10:01:37 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#
dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/FastJson2Impl.java
#
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployerTest.java
# dubbo-dependencies-bom/pom.xml
# dubbo-spring-boot/pom.xml
# dubbo-test/dubbo-test-spring/pom.xml
.../dubbo/common/config/ConfigurationUtils.java| 24 +++-
.../org/apache/dubbo/common/json/JsonUtil.java | 2 +
.../dubbo/common/json/impl/FastJson2Impl.java | 7
.../dubbo/common/json/impl/FastJsonImpl.java | 10 +
.../apache/dubbo/common/json/impl/GsonImpl.java| 13 +++
.../apache/dubbo/common/json/impl/JacksonImpl.java | 12 ++
.../org/apache/dubbo/common/utils/JsonUtils.java | 4 ++
.../common/extension/ExtensionDirectorTest.java| 3 +-
.../apache/dubbo/common/json/GsonUtilsTest.java| 3 +-
.../apache/dubbo/common/utils/JsonUtilsTest.java | 43 ++
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../config/deploy/DefaultApplicationDeployer.java | 3 ++
.../deploy/DefaultApplicationDeployerTest.java | 12 ++
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native-provider/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 16
dubbo-metrics/dubbo-metrics-prometheus/pom.xml | 2 +-
.../registry/zookeeper/ZookeeperRegistry.java | 12 +-
.../observability/autoconfigure/pom.xml| 2 +-
.../observability/pom.xml | 2 +-
dubbo-spring-boot/pom.xml | 2 +-
dubbo-test/dubbo-test-spring3.2/pom.xml| 2 +-
dubbo-test/dubbo-test-spring4.1/pom.xml| 2 +-
dubbo-test/dubbo-test-spring4.2/pom.xml| 2 +-
pom.xml| 2 +-
27 files changed, 155 insertions(+), 35 deletions(-)
diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/json/JsonUtil.java
index b03092ab7a,00..555792abca
mode 100644,00..100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/json/JsonUtil.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JsonUtil.java
@@@ -1,58 -1,0 +1,60 @@@
+/*
+ * 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.common.json;
+
+import org.apache.dubbo.common.extension.SPI;
+
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+@SPI
+public interface JsonUtil {
+boolean isSupport();
+
++boolean isJson(String json);
++
+ T toJavaObject(String json, Type type);
+
+ List toJavaList(String json, Class clazz);
+
+String toJson(Object obj);
+
+List getList(Map obj, String key);
+
+List> getListOfObjects(Map obj, String key);
+
+List getListOfStrings(Map obj, String key);
+
+Map getObject(Map obj, String key);
+
+Object convertObject(Object obj, Type type);
+
+Object convertObject(Object obj, Class clazz);
+
+Double getNumberAsDouble(Map obj, String key);
+
+Integer getNumberAsInteger(Map obj, String key);
+
+Long getNumberAsLong(Map obj, String key);
+
+String getString(Map obj, String key);
+
+List> checkObjectList(List rawList);
+
+List checkStringList(List rawList);
+}
diff --cc
dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/FastJson2Impl.java
index 09c795bb6e,ed0cca1d81..fb5dfa1d59
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/FastJson2Impl.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/FastJson2Impl.java
@@@ -19,9 -19,17 +19,16 @@@ package org.
(dubbo) 01/01: Merge branch '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 07440a06792a8a5053a7424d6278d7338397ef1e Merge: 583b57be2b d16f0ca310 Author: Albumen Kevin AuthorDate: Mon May 6 15:12:13 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # README.md # dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-remoting/dubbo-remoting-http12/pom.xml # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleServerStream.java # pom.xml .gitignore | 3 + README.md | 6 +- .../dubbo/rpc/cluster/router/state/BitList.java| 74 +++--- .../rpc/cluster/router/state/BitListTest.java | 42 .../src/main/java/org/apache/dubbo/common/URL.java | 21 ++ .../dubbo/common/constants/RegistryConstants.java | 7 ++ .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 10 +-- dubbo-maven-plugin/pom.xml | 2 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 74 +- .../observability/pom.xml | 2 +- 13 files changed, 180 insertions(+), 67 deletions(-) diff --cc README.md index 520c2b04a1,89fded1c5a..6b371e8b3b --- a/README.md +++ b/README.md @@@ -123,39 -242,13 +123,39 @@@ Please follow the [template](https://gi Please report security vulnerabilities to [us](mailto:secur...@dubbo.apache.org) privately. ## Contact +* WeChat: apachedubbo +* DingTalk group: 37290003945 +* Mailing list: [guide](https://dubbo.apache.org/zh-cn/contact/) +* Twitter: [@ApacheDubbo](https://twitter.com/ApacheDubbo) +* Security issues: please mail to [us](mailto:secur...@dubbo.apache.org) privately. -* Mailing list: -* dev list: for dev/user discussion. [subscribe](mailto:dev-subscr...@dubbo.apache.org), [unsubscribe](mailto:dev-unsubscr...@dubbo.apache.org), [archive](https://lists.apache.org/list.html?d...@dubbo.apache.org), [guide](https://github.com/apache/dubbo/wiki/Mailing-list-subscription-guide) +## Contributing -* Bugs: [Issues](https://github.com/apache/dubbo/issues/new?template=dubbo-issue-report-template.md) -* Gitter: [Gitter channel](https://gitter.im/alibaba/dubbo) -* Twitter: [@ApacheDubbo](https://twitter.com/ApacheDubbo) +See [CONTRIBUTING](https://github.com/apache/dubbo/blob/master/CONTRIBUTING.md) for details on submitting patches and the contribution workflow. + +### How can I contribute? + +* Take a look at issues with tags marked [`Good first issue`](https://github.com/apache/dubbo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) or [`Help wanted`](https://github.com/apache/dubbo/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). +* Join the discussion on the mailing list, subscription [guide](https://github.com/apache/dubbo/wiki/Mailing-list-subscription-guide). +* Answer questions on [issues](https://github.com/apache/dubbo/issues). +* Fix bugs reported on [issues](https://github.com/apache/dubbo/issues), and send us a pull request. +* Review the existing [pull request](https://github.com/apache/dubbo/pulls). +* Improve the [website](https://github.com/apache/dubbo-website), typically we need - * blog post - * translation on documentation - * use cases around the integration of Dubbo in enterprise systems. ++* blog post ++* translation on documentation ++* use cases around the integration of Dubbo in enterprise systems. +* Improve the [dubbo-admin/dubbo-monitor](https://github.com/apache/dubbo-admin). +* Contribute to the projects listed in [ecosystem](https://github.com/dubbo). +* Other forms of contribution not explicitly enumerated above. +* If you would like to contribute, please send an email to d...@dubbo.apache.org to let us know! + +## Reporting bugs + +Please follow the [template](https://github.com/apache/dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues. + +## Reporting a security vulnerability + +Please report security vulnerabilities to [us](mailto:secur...@dubbo.apache.org) privately. ## Dubbo ecosystem diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java index 0302f318ea,18cb945aee..0b7732ec8b --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java +++ b/dubbo-common/src/main/j
(dubbo) 01/01: Merge branch '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 53553dcef4866a16eba4803c86b6885c38ea0e90 Merge: 0840c60e54 45b5d44064 Author: Albumen Kevin AuthorDate: Wed Apr 10 13:15:14 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java # dubbo-dependencies-bom/pom.xml # dubbo-distribution/dubbo-apache-release/pom.xml # dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/AbstractMonitorFactory.java # dubbo-remoting/dubbo-remoting-http12/pom.xml # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerCallListener.java # dubbo-spring-boot/pom.xml # dubbo-test/dubbo-test-spring/pom.xml .../dubbo/rpc/cluster/SingleRouterChain.java | 6 ++-- .../cluster/configurator/AbstractConfigurator.java | 2 +- .../loadbalance/ConsistentHashLoadBalance.java | 5 ++- .../apache/dubbo/rpc/cluster/merger/MapMerger.java | 2 +- .../dubbo/rpc/cluster/merger/MergerFactory.java| 2 +- .../apache/dubbo/rpc/cluster/merger/SetMerger.java | 2 +- .../condition/ConditionStateRouterFactory.java | 2 +- .../config/ServiceStateRouterFactory.java | 2 +- .../cluster/router/mesh/route/MeshRuleCache.java | 2 +- .../router/mock/MockStateRouterFactory.java| 2 +- .../cluster/router/tag/TagStateRouterFactory.java | 2 +- .../cluster/support/FailoverClusterInvoker.java| 4 +-- .../rpc/cluster/support/MergeableCluster.java | 2 +- .../cluster/support/registry/ZoneAwareCluster.java | 2 +- .../support/wrapper/MockClusterWrapper.java| 2 +- .../main/java/org/apache/dubbo/common/Version.java | 2 +- .../common/beanutil/JavaBeanSerializeUtil.java | 6 ++-- .../org/apache/dubbo/common/bytecode/Mixin.java| 2 +- .../org/apache/dubbo/common/bytecode/Wrapper.java | 4 +-- .../dubbo/common/compiler/support/ClassUtils.java | 2 +- .../common/threadlocal/InternalThreadLocalMap.java | 2 +- .../dubbo/common/timer/HashedWheelTimer.java | 2 +- .../org/apache/dubbo/common/utils/CIDRUtils.java | 2 +- .../org/apache/dubbo/common/utils/ConfigUtils.java | 4 +-- .../org/apache/dubbo/common/utils/IOUtils.java | 2 +- .../java/org/apache/dubbo/common/utils/Stack.java | 2 +- .../org/apache/dubbo/common/utils/StringUtils.java | 4 +-- .../org/apache/dubbo/common/utils/UrlUtils.java| 2 +- .../dubbo/config/AbstractInterfaceConfig.java | 2 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 2 +- .../dubbo/metadata/definition/util/ClassUtils.java | 2 +- .../org/apache/dubbo/rpc/model/ProviderModel.java | 2 +- .../dubbo/cache/support/AbstractCacheFactory.java | 2 +- .../com/alibaba/dubbo/config/ServiceConfig.java| 2 +- .../com/alibaba/dubbo/container/page/Page.java | 4 +-- .../alibaba/dubbo/container/page/PageServlet.java | 4 +-- .../dubbo/container/page/ResourceFilter.java | 2 +- .../container/page/pages/HomePageHandler.java | 4 +-- .../dubbo/container/page/pages/LogPageHandler.java | 4 +-- .../container/page/pages/StatusPageHandler.java| 8 ++--- .../container/page/pages/SystemPageHandler.java| 18 +- .../java/com/alibaba/dubbo/rpc/RpcContext.java | 2 +- .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 6 ++-- .../org/apache/dubbo/config/ReferenceConfig.java | 1 + .../org/apache/dubbo/config/ServiceConfig.java | 4 +-- .../dubbo/config/utils/ConfigValidationUtils.java | 4 +-- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../AbstractAnnotationBeanPostProcessor.java | 5 ++- .../dubbo/config/spring/util/AnnotationUtils.java | 4 +-- .../config/spring/util/PropertySourcesUtils.java | 2 +- .../dubbo-configcenter-nacos/pom.xml | 28 +++ .../dubbo-demo-annotation-consumer/pom.xml | 30 dubbo-demo/dubbo-demo-annotation/pom.xml | 30 .../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 30 dubbo-demo/dubbo-demo-api/pom.xml | 30 dubbo-demo/dubbo-demo-generic-call/pom.xml | 30 .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-triple/pom.xml | 32 - dubbo-dependencies-bom/pom.xml | 22 ++-- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 28 +++ .../dubbo-dependencies-zookeeper/pom.xml | 28 +++ dubbo-distribution/dubbo-apache-release/pom.xml| 2 +- dubbo-maven-plugin/pom.xml | 4 +-- dubbo-metadata/dubbo-
(dubbo) 01/01: Merge branch '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 944be946acd50ac430854a3e197fe056a5cbde18
Merge: 0cce4c8afe 164aebf6ed
Author: Albumen Kevin
AuthorDate: Fri Mar 22 10:22:35 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# pom.xml
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
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-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml| 8
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java | 6 ++
.../dubbo/remoting/transport/netty4/NettyConnectionClient.java| 5 -
.../dubbo/common/serialize/fastjson2/FastJson2ObjectInput.java| 2 +-
.../dubbo/common/serialize/fastjson2/FastJson2ObjectOutput.java | 4 ++--
.../dubbo-zookeeper-curator5-spring-boot-starter/pom.xml | 2 +-
.../dubbo-spring-boot-starters/observability/pom.xml | 4 ++--
12 files changed, 25 insertions(+), 16 deletions(-)
diff --cc dubbo-config/dubbo-config-spring/pom.xml
index 78316e6243,d12920b529..a09bb6ab89
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@@ -74,9 -74,15 +74,9 @@@
org.aspectj
aspectjweaver
- 1.9.21.1
+ 1.9.21.2
test
-
- org.apache.dubbo
- dubbo-monitor-default
- ${project.parent.version}
- test
-
org.apache.dubbo
dubbo-rpc-dubbo
diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml
index 2e8d489301,41a7d8a2cb..1075039282
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@@ -35,9 -35,10 +35,9 @@@
true
2.7.18
2.7.18
- 1.12.3
+ 1.12.4
+
diff --cc dubbo-dependencies-bom/pom.xml
index 63cc1f9e50,a58a6f4a7b..496c7ce9b4
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -119,10 -119,9 +119,10 @@@
2.2
3.14.0
0.1.35
- 1.12.3
+ 1.12.4
-
+1.26.0
+2.16.4
- 1.2.3
+ 1.2.4
3.3
0.16.0
1.0.4
@@@ -172,10 -159,9 +172,10 @@@
1.1.10.5
1.70
+5.4.3
2.0.6
2.10.1
- 2.16.2
+ 2.17.0
6.1.26
2.0
1.6.0
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index fab9f50a09,99b0c92b14..1fc649f2f9
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@@ -31,11 -31,10 +31,11 @@@
pom
-3.2.12-SNAPSHOT
+3.3.0-beta.2-SNAPSHOT
1.6.0
+1.7.36
5.1.0
- 3.8.3
+ 3.8.4
2.43.0
check
1.0.0
diff --cc
dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
index 7fd88c8338,3ce640cd72..0695539be3
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
@@@ -31,9 -31,21 +31,9 @@@
5.1.0
- 3.8.3
+ 3.8.4
-
-
-
-org.apache.zookeeper
-parent
-${zookeeper_version}
-pom
-import
-
-
-
-
org.apache.curator
(dubbo) 01/01: Merge branch '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 9b3a32f8d6db3512076198cd84f3bc880677ec32
Merge: 1145b4015b 0553d70899
Author: Albumen Kevin
AuthorDate: Thu Mar 14 15:00:30 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-distribution/dubbo-apache-release/pom.xml
# dubbo-spring-boot/pom.xml
.asf.yaml | 2 ++
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native-provider/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 8 +++
dubbo-distribution/dubbo-apache-release/pom.xml| 2 +-
.../dubbo/qos/command/impl/ChangeTelnet.java | 3 ++-
.../apache/dubbo/qos/command/impl/CountTelnet.java | 3 ++-
.../dubbo/qos/command/impl/ChangeTelnetTest.java | 11 -
.../dubbo/qos/command/impl/CountTelnetTest.java| 26 +-
dubbo-test/dubbo-test-check/pom.xml| 2 +-
11 files changed, 50 insertions(+), 13 deletions(-)
diff --cc dubbo-dependencies-bom/pom.xml
index 9cf94d697f,b30413ef74..63cc1f9e50
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -147,35 -143,25 +147,35 @@@
1.2.17
1.2.13
- 2.23.0
+ 2.23.1
2.15.1
+1.16.0
0.13.0
1.0.11
+
+5.9.3
+4.13.2
+4.2.0
+2.2
+2.2.2
+4.11.0
+
2.2.7
1.2.0
- 1.19.6
+ 1.19.7
3.2.13
1.6.13
1.1.10.5
1.70
+5.4.3
2.0.6
2.10.1
- 2.16.1
+ 2.16.2
6.1.26
2.0
1.6.0
diff --cc dubbo-distribution/dubbo-apache-release/pom.xml
index ec914ff07e,fcd2ca4ac5..be51620299
--- a/dubbo-distribution/dubbo-apache-release/pom.xml
+++ b/dubbo-distribution/dubbo-apache-release/pom.xml
@@@ -15,86 -14,87 +15,86 @@@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-4.0.0
-
-org.apache.dubbo
-dubbo-distribution
-${revision}
-../pom.xml
-
-dubbo-apache-release
-pom
-dubbo-apache-release
-The apache source release
-
-true
-
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+org.apache.dubbo
+dubbo-distribution
+${revision}
+../pom.xml
+
+ dubbo-apache-release
+ pom
+ dubbo-apache-release
+ The apache source release
+
+true
+
-
-
-org.apache.dubbo
-dubbo-demo-api-provider
-${project.version}
-
-
-org.apache.dubbo
-dubbo-demo-api-consumer
-${project.version}
-
-
+
+
+ org.apache.dubbo
+ dubbo-demo-api-provider
+ ${project.version}
+
+
+ org.apache.dubbo
+ dubbo-demo-api-consumer
+ ${project.version}
+
+
-
-
-release
-
-apache-dubbo-${project.version}
-
-
-maven-assembly-plugin
-3.7.0
-
-
-bin
-package
-
-single
-
-
-
-
src/assembly/bin-release.xml
-
-
-
-
-src
-package
-
-single
-
-
-
-
src/assembly/source-release.xml
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-gpg-plugin
-1.6
-
-
-
(dubbo) 01/01: Merge branch '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 da2dd6d2a1f5a5266a343b6cb1bf0a73b2f53233 Merge: cb92fcc19e 501bdfaaef Author: Albumen Kevin AuthorDate: Tue Mar 12 11:36:55 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # README.md # dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java .../general.yml} | 66 ++-- .../question.yml} | 66 ++-- .github/ISSUE_TEMPLATE/1-bug.yml | 20 ++- .github/ISSUE_TEMPLATE/2-feature.yml | 18 +- .../PULL_REQUEST_TEMPLATE.md | 0 README.md | 70 +++--- .../filter/support/ConsumerContextFilter.java | 6 +- .../common/beans/factory/ScopeBeanFactory.java | 6 +- .../threadpool/support/AbortPolicyWithReport.java | 4 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 2 +- .../builder/PrimitiveTypeDefinitionBuilder.java| 2 +- .../dubbo/remoting/codec/ExchangeCodecTest.java| 2 +- .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 2 + .../dubbo/rpc/protocol/tri/TripleInvoker.java | 1 + .../endpoint/metadata/AbstractDubboMetadata.java | 2 +- 15 files changed, 175 insertions(+), 92 deletions(-) diff --cc README.md index 7e1d6569bf,975deece80..520c2b04a1 --- a/README.md +++ b/README.md @@@ -6,101 -6,249 +6,156 @@@  [](http://isitmaintained.com/project/apache/dubbo "Average time to resolve an issue") [](http://isitmaintained.com/project/apache/dubbo "Percentage of issues still open") - [](https://twitter.com/intent/tweet?text=Apache%20Dubbo%20is%20a%20high-performance%2C%20java%20based%2C%20open%20source%20RPC%20framework.&url=http://dubbo.apache.org/&via=ApacheDubbo&hashtags=rpc,java,dubbo,micro-service) - [](https://twitter.com/intent/follow?screen_name=ApacheDubbo) - [](https://gitter.im/alibaba/dubbo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -Apache Dubbo is a high-performance, Java-based open-source RPC framework. Please visit the [official site](http://dubbo.apache.org) for the quick start guide and documentation, as well as the [wiki](https://github.com/apache/dubbo/wiki) for news, FAQ, and release notes. +Apache Dubbo is an easy-to-use Web and RPC framework that provides multiple +language implementations(Java, [Go](https://github.com/apache/dubbo-go), [Rust](https://github.com/apache/dubbo-rust), [Node.js](https://github.com/apache/dubbo-js), [Web](https://github.com/apache/dubbo-js)) for communication, service discovery, traffic management, +observability, security, tools, and best practices for building enterprise-ready microservices. - Visit [the official website](https://dubbo.apache.org/) for more information. + We are now collecting Dubbo user info to help us to improve Dubbo further. Kindly support us by providing your usage information on [Wanted: who's using dubbo](https://github.com/apache/dubbo/discussions/13842), thanks :) ## Architecture -  -## Features - -* Transparent interface based RPC -* Intelligent load balancing -* Automatic service registration and discovery -* High extensibility -* Runtime traffic routing -* Visualized service governance +* Consumer and provider communicate with each other using RPC protocol like triple, tcp, rest, etc. +* Consumers automatically trace provider instances registered in registries(Zookeeper, Nacos) and distribute traffic among them by following traffic strategies. +* Rich features for monitoring and managing the cluster with dynamic configuration, metrics, tracing, security, and visualized console. ## Getting started +Follow the instructions below to learn how to: -The following code snippet comes from [Dubbo Samples](https://github.com/apache/dubbo-samples.git). You may clone the sample project and step into the `dubbo-samples-api` subdirectory before proceeding. - -```bash -git clone https://github.com/apache/dubbo-samples.git -cd dubbo-samples/1-basic/dubbo-samples-api -``` - -There's a [README](https://github.com/apache/dubbo-samples/blob/389cd612f1ea57ee6e575005b32f195c442c35a2/1-basic/dubbo-samples-api/RE
(dubbo) 01/01: Merge branch '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 9b3073c2f482df56c1d1c636498ff43fe527dcfc Merge: 76390eed4e cfd6ebe611 Author: Albumen Kevin AuthorDate: Wed Mar 6 11:11:38 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml .github/workflows/build-and-test-pr.yml | 8 .github/workflows/build-and-test-scheduled-3.1.yml| 8 .github/workflows/build-and-test-scheduled-3.2.yml| 8 .github/workflows/build-and-test-scheduled-3.3.yml| 8 .github/workflows/release-test.yml| 8 .../dubbo/configcenter/support/nacos/MockConfigService.java | 4 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-dependencies-bom/pom.xml| 4 ++-- .../org/apache/dubbo/metadata/store/nacos/MockConfigService.java | 4 10 files changed, 32 insertions(+), 24 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 3cee586edc,92f13e2b17..9cf94d697f --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -134,13 -133,10 +134,13 @@@ 3.15.6.Final 1.9.13 8.5.99 - 2.2.4 + 2.3.1 +1.8.6 +1.6.1 - 1.61.1 + 1.62.2 0.8.1 1.2.2 +0.9.10 1.7.36 1.3.0
(dubbo) 01/01: Merge branch '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 76390eed4e7d002be6dbda7597cd546e3050ede9
Merge: 3f2e0e18c9 8a1296f892
Author: Albumen Kevin
AuthorDate: Tue Mar 5 09:47:49 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-spring-boot/pom.xml
.github/ISSUE_TEMPLATE/1-bug.yml | 126
.github/ISSUE_TEMPLATE/2-feature.yml | 90 +++
.github/ISSUE_TEMPLATE/bug_report.md | 39 -
.github/ISSUE_TEMPLATE/config.yml | 28 +++-
.github/ISSUE_TEMPLATE/discussion.md | 11 --
.github/ISSUE_TEMPLATE/feature_request.md | 16 --
.github/ISSUE_TEMPLATE/proposal.md | 15 --
.github/ISSUE_TEMPLATE/question.md | 13 --
.../rpc/cluster/directory/AbstractDirectory.java | 167 +
.../router/condition/ConditionStateRouter.java | 2 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 16 +-
.../java/org/apache/dubbo/common/URLBuilder.java | 7 +-
.../dubbo/common/config/ModuleEnvironment.java | 18 +--
.../common/url/component/ServiceConfigURL.java | 4 +-
.../org/apache/dubbo/common/utils/LockUtils.java | 54 +++
.../config/OrderedPropertiesConfigurationTest.java | 16 ++
.../apache/dubbo/common/utils/LockUtilsTest.java | 144 ++
.../java/com/alibaba/dubbo/common/DelegateURL.java | 4 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../annotation/ServiceAnnotationPostProcessor.java | 3 +
.../org/apache/dubbo/demo/RestDemoService.java | 2 +-
.../dubbo-demo-native-consumer/pom.xml | 4 +-
.../dubbo-demo-native-provider/pom.xml | 4 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 26 ++--
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../registry/integration/DynamicDirectory.java | 2 +-
.../rest/extension/resteasy/ResteasyContext.java | 7 +-
.../resteasy/filter/ResteasyNettyHttpResponse.java | 9 +-
.../rpc/protocol/rest/message/codec/JsonCodec.java | 3 +-
.../protocol/rest/message/codec/StringCodec.java | 2 +-
.../rpc/protocol/rest/netty/NettyHttpResponse.java | 4 +
.../observability/pom.xml | 4 +-
dubbo-spring-boot/pom.xml | 2 +-
dubbo-test/dubbo-test-check/pom.xml| 2 +-
pom.xml| 6 +-
38 files changed, 629 insertions(+), 231 deletions(-)
diff --cc dubbo-config/dubbo-config-spring/pom.xml
index 3a092d4f8c,cab899df20..78316e6243
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@@ -74,9 -74,15 +74,9 @@@
org.aspectj
aspectjweaver
- 1.9.21
+ 1.9.21.1
test
-
- org.apache.dubbo
- dubbo-monitor-default
- ${project.parent.version}
- test
-
org.apache.dubbo
dubbo-rpc-dubbo
diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml
index 90860bd948,c10dd0fa44..2e8d489301
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@@ -35,9 -35,10 +35,9 @@@
true
2.7.18
2.7.18
- 1.12.2
+ 1.12.3
+
diff --cc dubbo-dependencies-bom/pom.xml
index c69bae2fd6,d5221fbc7d..3cee586edc
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -91,16 -91,16 +91,16 @@@
5.3.25
- 5.8.9
+ 5.8.10
3.30.2-GA
- 1.14.11
-1.14.12
++1.14.12
3.2.10.Final
- 4.1.106.Final
+ 4.1.107.Final
4.5.14
4.4.16
1.2.83
- 2.0.46
+ 2.0.47
-3.7.0
+3.7.2
5.1.0
2.12.0
3.10.0
@@@ -119,10 -119,9 +119,10 @@@
2.2
3.14.0
0.1.35
- 1.12.2
+ 1.12.3
-
+1.26.0
+2.16.4
- 1.2.2
+ 1.2.3
3.3
0.16.0
1.0.4
@@@ -133,10 -132,8 +133,10 @@@
2.1.1
3.15.6.Final
1.9.13
- 8.5.98
+ 8.5.99
2.2.4
+1.8.6
+1.6.1
1.61.1
0.8.1
1.2.2
@@@ -147,26 -143,17 +147,26 @@@
1.2.17
1.2.13
- 2.22.1
+ 2.23.0
2.15.1
+1.16.0
0.13.0
1.0.11
+
+5.9.3
+4.13.2
+4.2.0
+2.2
+2.2.2
+4.11.0
+
2.2.7
1.2.0
- 1.19.5
+ 1.19.6
3.2.13
1.6.13
diff --cc
dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/JsonCodec.java
index 0c3cedf8e9,49994f18b1..d6
(dubbo) 01/01: Merge branch '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 70b1ecb6627c1150a5746a62de0627b2b5bbc374 Merge: e2ea0046d2 caed64b2a6 Author: Albumen Kevin AuthorDate: Tue Feb 20 11:27:00 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml .../loadbalance/ConsistentHashLoadBalance.java | 8 ++ .../loadbalance/ConsistentHashLoadBalanceTest.java | 33 ++ dubbo-config/dubbo-config-api/pom.xml | 2 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 6 ++-- 6 files changed, 42 insertions(+), 11 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index f1d4d55526,66694e28aa..c69bae2fd6 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -99,8 -99,8 +99,8 @@@ 4.5.14 4.4.16 1.2.83 - 2.0.45 + 2.0.46 -3.7.0 +3.7.2 5.1.0 2.12.0 3.10.0 @@@ -135,12 -134,9 +135,12 @@@ 1.9.13 8.5.98 2.2.4 +1.8.6 +1.6.1 - 1.61.0 + 1.61.1 0.8.1 1.2.2 +0.9.10 1.7.36 1.3.0 @@@ -156,17 -151,9 +156,17 @@@ 1.0.11 + +5.9.3 +4.13.2 +4.2.0 +2.2 +2.2.2 +4.11.0 + 2.2.7 1.2.0 - 1.19.4 + 1.19.5 3.2.13 1.6.13
(dubbo) 01/01: Merge branch '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 74dd87c15b7cc31597e8ee9bde492531eb9c9903 Merge: d018475f73 180ff9785a Author: Albumen Kevin AuthorDate: Wed Dec 27 23:38:38 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java | 3 +++ 1 file changed, 3 insertions(+)
(dubbo) 01/01: Merge branch '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 d018475f730ef550ff08864b97136aa5419ec44d Merge: 2a0755c279 745ba45ea4 Author: Albumen Kevin AuthorDate: Wed Dec 27 23:27:35 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # README.md # dubbo-common/pom.xml # dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java # dubbo-demo/dubbo-demo-triple/pom.xml # dubbo-dependencies-bom/pom.xml # dubbo-distribution/dubbo-all/pom.xml # dubbo-metadata/dubbo-metadata-processor/pom.xml # dubbo-native-plugin/pom.xml # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java # dubbo-spring-boot/pom.xml .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .licenserc.yaml| 1 - README.md | 46 codecov.yml| 1 - dubbo-common/pom.xml | 5 + .../configcenter/TreePathDynamicConfiguration.java | 1 - .../apache/dubbo/common/utils/ProtobufUtils.java | 46 .../apache/dubbo/config/AbstractServiceConfig.java | 19 +- .../dubbo/config/annotation/DubboService.java | 29 +- .../dubbo/rpc/model/StubMethodDescriptor.java | 4 - .../main/resources/security/serialize.blockedlist | 1 - .../dubbo/common/utils/ProtobufUtilsTest.java | 38 +++ .../org/apache/dubbo/rpc/model/HelloReply.java | 47 .../org/apache/dubbo/rpc/model/HelloRequest.java | 47 .../apache/dubbo/config/ProviderConfigTest.java| 43 +-- .../context/annotation/EnableDubboConfigTest.java | 1 - .../src/test/resources/META-INF/config.properties | 1 - dubbo-config/dubbo-config-api/pom.xml | 7 + .../org/apache/dubbo/config/ServiceConfig.java | 4 + .../config/bootstrap/builders/ArgumentBuilder.java | 4 + .../bootstrap/builders/ConfigCenterBuilder.java| 5 + .../config/bootstrap/builders/ConsumerBuilder.java | 4 + .../config/bootstrap/builders/MethodBuilder.java | 5 + .../config/bootstrap/builders/MetricsBuilder.java | 220 +++ .../config/bootstrap/builders/ModuleBuilder.java | 5 + .../config/bootstrap/builders/MonitorBuilder.java | 5 + .../config/bootstrap/builders/ProtocolBuilder.java | 20 ++ .../config/bootstrap/builders/ProviderBuilder.java | 26 ++ .../bootstrap/builders/ReferenceBuilder.java | 1 + .../config/bootstrap/builders/RegistryBuilder.java | 1 + .../config/bootstrap/builders/ServiceBuilder.java | 1 + .../dubbo/config/utils/ConfigValidationUtils.java | 9 + .../apache/dubbo/config/AbstractConfigTest.java| 25 ++ .../apache/dubbo/config/ProviderConfigTest.java| 74 +++-- .../ConsulDubboServiceConsumerBootstrap.java | 55 .../ConsulDubboServiceProviderBootstrap.java | 46 .../dubbo/config/bootstrap/DubboBootstrapTest.java | 42 ++- .../bootstrap/DubboServiceConsumerBootstrap.java | 13 - .../bootstrap/DubboServiceProviderBootstrap.java | 10 - .../DubboServiceProviderMinimumBootstrap.java | 1 - .../EtcdDubboServiceConsumerBootstrap.java | 56 .../EtcdDubboServiceProviderBootstrap.java | 90 -- .../bootstrap/builders/ArgumentBuilderTest.java| 8 +- .../builders/ConfigCenterBuilderTest.java | 30 +- .../bootstrap/builders/ConsumerBuilderTest.java| 16 +- .../bootstrap/builders/MethodBuilderTest.java | 38 +-- .../bootstrap/builders/MetricsBuilderTest.java | 303 + .../bootstrap/builders/ModuleBuilderTest.java | 18 +- .../bootstrap/builders/MonitorBuilderTest.java | 22 +- .../bootstrap/builders/ProviderBuilderTest.java| 48 ++-- .../DubboInterfaceConsumerBootstrap.java | 3 - .../config/spring/util/DubboAnnotationUtils.java | 4 +- .../context/annotation/EnableDubboConfigTest.java | 1 - .../dubbo-demo-native-consumer/pom.xml | 13 +- .../dubbo-demo-native-provider/pom.xml | 13 +- dubbo-demo/dubbo-demo-triple/pom.xml | 3 + dubbo-dependencies-bom/pom.xml | 158 +-- dubbo-distribution/dubbo-all/pom.xml | 4 + dubbo-maven-plugin/pom.xml | 4 +- .../apache/dubbo/metrics/data/RtStatComposite.java | 4 +- .../metrics/model/sample/GaugeMetricSample.java| 24 +- .../src/main/resources/Dubbo3TripleStub.mustache | 30 +- .../resources/ReactorDubbo3TripleStub.mustache | 23 +- .../integration/DefaultServiceURLCustomizer.java | 120 .../registry/integration/RegistryProtocol.java | 121 ++-- .../registry/integration/ServiceURLCustomizer.java | 39 +++
(dubbo) 01/01: Merge branch '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 3de3ccf4576eb085f6143fcac0181b852aeac7f8
Merge: 5b0b86b11d d4bbf96f08
Author: Albumen Kevin
AuthorDate: Tue Dec 19 11:36:32 2023 +0800
Merge branch '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-spring-boot/pom.xml
# pom.xml
.github/workflows/build-and-test-pr.yml| 132 --
.github/workflows/build-and-test-scheduled-3.1.yml | 154 +
.github/workflows/build-and-test-scheduled-3.2.yml | 130 ++---
...ed-3.2.yml => build-and-test-scheduled-3.3.yml} | 142 +++
.github/workflows/release-test.yml | 123 ++--
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 10 +-
.../serialize/hessian2/Hessian2FactoryManager.java | 3 +-
.../observability/pom.xml | 4 +-
pom.xml| 6 +-
11 files changed, 603 insertions(+), 105 deletions(-)
diff --cc dubbo-config/dubbo-config-spring/pom.xml
index 983d0b0547,60a4991be7..cf91bb0a15
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@@ -74,9 -74,15 +74,9 @@@
org.aspectj
aspectjweaver
- 1.9.20.1
+ 1.9.21
test
-
- org.apache.dubbo
- dubbo-monitor-default
- ${project.parent.version}
- test
-
org.apache.dubbo
dubbo-rpc-dubbo
diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml
index ac0e86dfb6,8101a0bc26..5668551daf
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@@ -35,9 -35,10 +35,9 @@@
true
2.7.18
2.7.18
- 1.12.0
+ 1.12.1
+
diff --cc dubbo-dependencies-bom/pom.xml
index 9895ab87bc,844033596b..9587c6f6d6
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -93,9 -93,9 +93,9 @@@
5.3.25
5.8.8
3.29.2-GA
-1.14.10
+1.14.10
3.2.10.Final
- 4.1.101.Final
+ 4.1.104.Final
2.2.1
2.4.4
4.5.14
@@@ -133,9 -133,8 +133,9 @@@
1.8.0
0.1.35
1.12.0
-
+1.26.0
+2.16.4
- 1.2.0
+ 1.2.1
3.3
0.16.0
1.0.4
@@@ -154,16 -151,14 +154,16 @@@
1.60.0
0.8.1
1.2.2
+0.9.10
1.7.36
- 1.2
+ 1.3.0
1.2.17
1.2.11
- 2.20.0
+ 2.22.0
2.11.0
+1.16.0
0.13.0
diff --cc
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
index aba58da02e,f397dbc4b0..8040e8d471
---
a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
+++
b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
@@@ -21,9 -21,9 +21,10 @@@ import org.apache.dubbo.common.utils.De
import org.apache.dubbo.common.utils.SerializeCheckStatus;
import org.apache.dubbo.common.utils.SerializeSecurityManager;
import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.SystemPropertyConfigUtils;
import org.apache.dubbo.rpc.model.FrameworkModel;
+ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.com.caucho.hessian.io.SerializerFactory;
(dubbo) 01/01: Merge branch '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 0fccd2ccaef9c484624244ec9dc5f546e5f29259 Merge: ad803e1c84 33677c050d Author: Albumen Kevin AuthorDate: Thu Dec 14 19:36:25 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-build-tools/pom.xml # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-kubernetes/pom.xml # dubbo-native-plugin/pom.xml # dubbo-xds/pom.xml # dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java # pom.xml .../dubbo/common/constants/ProviderConstants.java | 28 -- .../serialization/PreferSerializationProvider.java | 8 +- .../org/apache/dubbo/config/ProtocolConfig.java| 9 +- .../dubbo/config/context/ConfigManagerTest.java| 10 + .../apache/dubbo/generic/GenericServiceTest.java | 6 +- .../apache/dubbo/config/ProtocolConfigTest.java| 6 +- .../utils/TestPreferSerializationProvider.java | 14 +- .../dubbo-configcenter-apollo/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 16 +- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- dubbo-dependencies/pom.xml | 2 +- dubbo-distribution/dubbo-all/pom.xml | 23 -- dubbo-distribution/dubbo-apache-release/pom.xml| 2 +- dubbo-distribution/dubbo-bom/pom.xml | 13 - dubbo-distribution/dubbo-core-spi/pom.xml | 6 - dubbo-distribution/pom.xml | 2 +- dubbo-kubernetes/pom.xml | 78 .../kubernetes/KubernetesMeshEnvListener.java | 207 -- .../KubernetesMeshEnvListenerFactory.java | 42 -- .../registry/kubernetes/KubernetesRegistry.java| 50 --- .../kubernetes/KubernetesRegistryFactory.java | 34 -- .../kubernetes/KubernetesServiceDiscovery.java | 451 - .../KubernetesServiceDiscoveryFactory.java | 28 -- .../dubbo/registry/kubernetes/MeshConstant.java| 45 -- .../kubernetes/NopKubernetesMeshEnvListener.java | 34 -- .../kubernetes/util/KubernetesClientConst.java | 78 .../kubernetes/util/KubernetesConfigUtils.java | 104 - .../org.apache.dubbo.registry.RegistryFactory | 1 - ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 - ...luster.router.mesh.route.MeshEnvListenerFactory | 1 - .../kubernetes/KubernetesServiceDiscoveryTest.java | 289 - .../org.mockito.plugins.MockMaker | 1 - dubbo-maven-plugin/pom.xml | 6 +- .../transport/netty4/ssl/SslServerTlsHandler.java | 7 +- .../rpc/protocol/tri/ReflectionPackableMethod.java | 24 +- .../apache/dubbo/rpc/protocol/tri/DataWrapper.java | 7 +- .../dubbo/rpc/protocol/tri/DescriptorService.java | 11 + .../protocol/tri/ReflectionPackableMethodTest.java | 32 ++ .../SerializationScopeModelInitializer.java| 17 +- .../support/PreferSerializationProviderImpl.java | 42 ++ ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 + .../fastjson2/FastJson2Serialization.java | 15 + .../fastjson2/Fastjson2ScopeModelInitializer.java | 14 +- .../hessian2/Hessian2ScopeModelInitializer.java| 14 +- .../serialize/hessian2/Hessian2Serialization.java | 16 + dubbo-test/dubbo-dependencies-all/pom.xml | 13 - dubbo-test/dubbo-test-check/pom.xml| 2 +- dubbo-xds/pom.xml | 131 -- .../dubbo/registry/xds/XdsCertificateSigner.java | 58 --- .../org/apache/dubbo/registry/xds/XdsRegistry.java | 50 --- .../dubbo/registry/xds/XdsRegistryFactory.java | 34 -- .../dubbo/registry/xds/XdsServiceDiscovery.java| 117 -- .../registry/xds/XdsServiceDiscoveryFactory.java | 48 --- .../xds/istio/IstioCitadelCertificateSigner.java | 294 -- .../dubbo/registry/xds/istio/IstioConstant.java| 109 - .../apache/dubbo/registry/xds/istio/IstioEnv.java | 195 - .../dubbo/registry/xds/util/AdsObserver.java | 140 --- .../dubbo/registry/xds/util/NodeBuilder.java | 43 -- .../dubbo/registry/xds/util/PilotExchanger.java| 250 .../apache/dubbo/registry/xds/util/XdsChannel.java | 142 --- .../xds/util/bootstrap/BootstrapInfoImpl.java | 131 -- .../registry/xds/util/bootstrap/Bootstrapper.java | 75 .../xds/util/bootstrap/BootstrapperImpl.java | 179 .../bootstrap/CertificateProviderInfoImpl.java | 45 -- .../xds/util/bootstrap/ServerInfoImpl.java | 71 .../xds/util/protocol/AbstractProtocol.java| 269 .../registry/xds/util/protocol/DeltaRe
(dubbo) 01/01: Merge branch '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 7a44bb8ba1820c9dee50e37133b80881b1f91727 Merge: fe4a9f3592 6194b43a87 Author: Albumen Kevin AuthorDate: Mon Nov 20 10:59:46 2023 +0800 Merge branch '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 # pom.xml .../org/apache/dubbo/common/utils/DefaultSerializeClassChecker.java | 6 -- .../src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java | 4 2 files changed, 4 insertions(+), 6 deletions(-)
(dubbo) 01/01: Merge branch '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 fe4a9f35923f54bd681f7ad0c42df004768a0631
Merge: 3aacb6642c a8b83823dc
Author: Albumen Kevin
AuthorDate: Thu Nov 16 17:54:28 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
.../threadlocal/InternalThreadLocalTest.java | 2 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 11 ++--
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 73 ++
.../protocol/injvm/DefaultParamDeepCopyUtil.java | 9 ++-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 49 +++
.../rpc/protocol/injvm/ParamDeepCopyUtil.java | 8 ++-
.../rpc/protocol/tri/TripleHttp2Protocol.java | 2 +-
.../tri/transport/TripleGoAwayHandler.java | 4 +-
8 files changed, 132 insertions(+), 26 deletions(-)
diff --cc
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
index 215a2e3aaf,ba1ae2e05e..1a82e343a3
---
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
+++
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
@@@ -116,14 -119,26 +116,14 @@@ public class TripleHttp2Protocol extend
.maxFrameSize(config.getInt(H2_SETTINGS_MAX_FRAME_SIZE_KEY,
DEFAULT_MAX_FRAME_SIZE))
.maxHeaderListSize(
config.getInt(H2_SETTINGS_MAX_HEADER_LIST_SIZE_KEY,
DEFAULT_MAX_HEADER_LIST_SIZE)))
-.frameLogger(SERVER_LOGGER)
+.frameLogger(CLIENT_LOGGER)
.build();
-ExecutorSupport executorSupport =
ExecutorRepository.getInstance(url.getOrDefaultApplicationModel())
-.getExecutorSupport(url);
-
codec.connection().local().flowController().frameWriter(codec.encoder().frameWriter());
-TripleWriteQueue writeQueue = new TripleWriteQueue();
-final Http2MultiplexHandler handler = new Http2MultiplexHandler(new
ChannelInitializer() {
-@Override
-protected void initChannel(Http2StreamChannel ch) {
-final ChannelPipeline p = ch.pipeline();
-p.addLast(new TripleCommandOutBoundHandler());
-p.addLast(new TripleHttp2FrameServerHandler(
-frameworkModel, executorSupport, headFilters, ch,
writeQueue));
-}
-});
+//
codec.connection().local().flowController().frameWriter(codec.encoder().frameWriter());
List handlers = new ArrayList<>();
handlers.add(new ChannelHandlerPretender(codec));
-handlers.add(new ChannelHandlerPretender(new
FlushConsolidationHandler(64, true)));
-handlers.add(new ChannelHandlerPretender(new
TripleServerConnectionHandler()));
-handlers.add(new ChannelHandlerPretender(handler));
+handlers.add(new ChannelHandlerPretender(new
Http2MultiplexHandler(new ChannelDuplexHandler(;
- handlers.add(new ChannelHandlerPretender(new TripleGoAwayHandler()));
+handlers.add(new ChannelHandlerPretender(new
TriplePingPongHandler(UrlUtils.getCloseTimeout(url;
++handlers.add(new ChannelHandlerPretender(new TripleGoAwayHandler()));
handlers.add(new ChannelHandlerPretender(new TripleTailHandler()));
operator.configChannelHandler(handlers);
}
(dubbo) 01/01: Merge branch '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 976516cbc186989ff1a9ec12a3587e50ce3c0947 Merge: 39611ea28c 8daa3dc5f0 Author: Albumen Kevin AuthorDate: Wed Nov 15 11:40:53 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java dubbo-dependencies-bom/pom.xml | 2 +- dubbo-distribution/pom.xml | 2 +- .../DubboEndpointAnnotationAutoConfiguration.java | 4 + .../DubboMetricsAutoConfiguration.java | 4 + .../DubboEndpointAutoConfiguration.java| 4 + .../DubboEndpointMetadataAutoConfiguration.java| 4 + .../DubboHealthIndicatorAutoConfiguration.java | 5 +- ...DubboAutoConfigurationOnMultipleConfigTest.java | 207 - .../DubboAutoConfigurationOnSingleConfigTest.java | 66 ++- .../boot/autoconfigure/TestBeansConfiguration.java | 81 .../AwaitingNonWebApplicationListenerTest.java | 2 + .../DubboMicrometerTracingAutoConfiguration.java | 4 + .../DubboObservationAutoConfiguration.java | 4 + .../brave/BraveAutoConfiguration.java | 3 + .../exporter/otlp/OtlpAutoConfiguration.java | 2 + .../exporter/zipkin/ZipkinAutoConfiguration.java | 2 + .../otel/OpenTelemetryAutoConfiguration.java | 3 + 17 files changed, 173 insertions(+), 226 deletions(-) diff --cc dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java index a2524e9e01,9eea34b368..d7014b64a8 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java @@@ -36,11 -36,12 +36,14 @@@ import org.springframework.boot.autocon import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; + import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; + import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; + /** * Register observationRegistry to ApplicationModel. * Create observationRegistry when you are using Boot <3.0 or you are not using spring-boot-starter-actuator
(dubbo) 01/01: Merge branch '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 c3b0c2eefa3ce403cdfca717e7380244d346d8d6 Merge: 865f68bdc5 28b2763ec0 Author: Albumen Kevin AuthorDate: Mon Nov 13 10:07:57 2023 +0800 Merge branch '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 # pom.xml .github/workflows/build-and-test-pr.yml | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[dubbo] 01/01: Merge branch '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 0562b648280471a90b1426106baa6939ec88743d
Merge: 7696e1b42c fa11b68a16
Author: Albumen Kevin
AuthorDate: Wed Oct 18 19:02:54 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-cluster/pom.xml
# dubbo-dependencies-bom/pom.xml
#
dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
dubbo-cluster/pom.xml | 7 ++
.../threadpool/serial/SerializingExecutor.java | 7 +-
.../support/cached/CachedThreadPool.java | 17 +++--
.../support/limited/LimitedThreadPool.java | 17 +++--
.../apache/dubbo/common/utils/ExecutorUtil.java| 15 +++--
.../executor/AbstractIsolationExecutorSupport.java | 1 +
.../dubbo/rpc/executor/DefaultExecutorSupport.java | 1 +
.../spring/util/LazyTargetInvocationHandler.java | 6 +-
.../dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native-provider/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 12 ++--
.../apache/dubbo/metrics/model/MetricsSupport.java | 8 ++-
.../dubbo/qos/protocol/QosProtocolWrapper.java | 23 ---
.../java/org/apache/dubbo/remoting/Constants.java | 2 +
.../dubbo/remoting/transport/AbstractClient.java | 3 +-
.../transport/netty4/NettyConnectionClient.java| 25 +++
.../dubbo-remoting-zookeeper-curator5/pom.xml | 2 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 4 +-
.../apache/dubbo/rpc/filter/EchoFilterTest.java| 34 +-
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 33 +-
.../rest/filter/ServiceInvokeRestFilter.java | 2 +
.../dubbo/rpc/protocol/tri/DeadlineFuture.java | 14 ++--
.../rpc/protocol/tri/ReflectionPackableMethod.java | 19 ++
.../rpc/protocol/tri/TripleHttp2Protocol.java | 29 +
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 25 ---
.../rpc/protocol/tri/TriplePingPongHandler.java| 76 ++
.../dubbo/rpc/protocol/tri/TripleProtocol.java | 16 +++--
.../tri/call/ReflectionAbstractServerCall.java | 29 ++---
...ClientHandler.java => TripleGoAwayHandler.java} | 18 ++---
.../tri/call/ReflectionServerCallTest.java | 4 ++
.../pom.xml| 2 +-
.../observability/pom.xml | 4 +-
dubbo-spring-boot/pom.xml | 2 +-
dubbo-test/dubbo-test-check/pom.xml| 2 +-
pom.xml| 2 +-
36 files changed, 303 insertions(+), 164 deletions(-)
diff --cc dubbo-cluster/pom.xml
index 08b83b8cca,2013b81c99..1f0173e6df
--- a/dubbo-cluster/pom.xml
+++ b/dubbo-cluster/pom.xml
@@@ -86,5 -87,16 +87,11 @@@
${project.parent.version}
true
-
-io.micrometer
-micrometer-tracing-integration-test
-test
-
+
+ org.openjdk.nashorn
+ nashorn-core
+ ${nashorn-core.version}
+ test
+
diff --cc dubbo-dependencies-bom/pom.xml
index 6ac87dfb4d,50f6cccd14..89719f7cb6
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -133,10 -133,9 +133,10 @@@
3.12.0
1.8.0
0.1.35
- 1.11.4
+ 1.11.5
-
+1.26.0
+2.16.4
- 1.1.5
+ 1.1.6
3.3
0.16.0
1.0.4
diff --cc
dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
index ab75d2b183,4ffe4b0b17..d6969e7731
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
@@@ -177,10 -174,11 +177,12 @@@ public interface Constants
String OK_HTTP = "ok-http";
String URL_CONNECTION = "url-connection";
String APACHE_HTTP_CLIENT = "apache-http-client";
+String PORT_UNIFICATION_NETTY4_SERVER = "netty4";
+List REST_SERVER = Arrays.asList("jetty", "tomcat", "netty");
String CONTENT_LENGTH_KEY = "content-length";
-
String USE_SECURE_RANDOM_ID =
"dubbo.application.use-secure-random-request-id";
+ String CONNECTION_HANDLER_NAME = "connectionHandler";
+
}
[dubbo] 01/01: Merge branch '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 8bdcaf6865a8d59f3a0b68f252ebcbe30e9b7411 Merge: c72c55aa67 a4ca07087e Author: Albumen Kevin AuthorDate: Wed Oct 11 09:35:22 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .github/workflows/build-and-test-pr.yml| 5 +- ...HandlerTest.java => CreateObserverAdapter.java} | 57 +++-- .../reactive/ManyToManyMethodHandlerTest.java | 28 +++ .../dubbo/reactive/ManyToOneMethodHandlerTest.java | 58 -- .../dubbo/reactive/OneToManyMethodHandlerTest.java | 47 ++ 5 files changed, 74 insertions(+), 121 deletions(-)
[dubbo] 01/01: Merge branch '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 bbee466e44d230a5a5d1bae9ed79927e9402b0ea Merge: acee3e2f03 3ca35045a0 Author: Albumen Kevin AuthorDate: Tue Oct 10 10:30:03 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .github/workflows/build-and-test-pr.yml| 8 +- .github/workflows/build-and-test-scheduled-3.1.yml | 8 +- .github/workflows/build-and-test-scheduled-3.2.yml | 8 +- .github/workflows/release-test.yml | 8 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 12 +- .../dubbo-configcenter-zookeeper/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 8 +- .../client/ServiceDiscoveryRegistryDirectory.java | 8 +- .../protocol/tri/stream/TripleClientStream.java| 46 ++-- .../protocol/tri/stream/TripleServerStream.java| 31 +-- .../dubbo/rpc/stub/StubInvocationUtilTest.java | 236 +++-- .../observability/pom.xml | 2 +- 13 files changed, 154 insertions(+), 225 deletions(-)
[dubbo] 01/01: Merge branch '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 3ed2dacbef79dae8f13a3c50f5ffb39bfe386bbc Merge: 8009c72030 031da7b8ed Author: Albumen Kevin AuthorDate: Mon Sep 11 17:16:07 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java # dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/DefaultMetricsCollector.java # dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java # pom.xml .../rpc/cluster/directory/AbstractDirectory.java | 1 + .../dubbo/common/constants/CommonConstants.java| 2 +- .../dubbo/common/constants/MetricsConstants.java | 8 ++-- .../dubbo/common/logger/ErrorTypeAwareLogger.java | 15 +++ .../org/apache/dubbo/config/AbstractConfig.java| 36 - .../org/apache/dubbo/config/MetricsConfig.java | 26 .../org/apache/dubbo/config/ReferenceConfig.java | 9 - .../org/apache/dubbo/config/ServiceConfig.java | 9 - .../config/deploy/DefaultApplicationDeployer.java | 1 + dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../apache/dubbo/config/spring/ReferenceBean.java | 11 - .../annotation/ServiceAnnotationPostProcessor.java | 2 +- .../context/DubboConfigApplicationListener.java| 25 +++- .../spring/reference/ReferenceBeanManager.java | 2 +- .../META-INF/isolation/dubbo-provider.xml | 2 +- dubbo-dependencies-bom/pom.xml | 6 +-- .../collector/AggregateMetricsCollector.java | 14 +-- .../metrics/collector/DefaultMetricsCollector.java | 13 ++ .../metrics/report/AbstractMetricsReporter.java| 18 + .../dubbo/qos/protocol/QosProtocolWrapper.java | 12 -- .../apache/dubbo/qos/server/QosBindException.java | 28 - .../java/org/apache/dubbo/qos/server/Server.java | 20 + .../java/org/apache/dubbo/remoting/Constants.java | 4 ++ .../http/restclient/HttpClientRestClient.java | 3 +- .../netty4/NettyPortUnificationServer.java | 47 +- .../remoting/transport/netty4/NettyServer.java | 29 - .../remoting/transport/netty4/ConnectionTest.java | 6 +-- .../netty4/PortUnificationServerTest.java | 5 +-- .../MultiplexProtocolConnectionManagerTest.java| 7 ++-- .../api/SingleProtocolConnectionManagerTest.java | 3 +- .../rest/extension/resteasy/ResteasyContext.java | 4 +- .../ResteasyRequestContainerFilterAdapter.java | 5 +-- .../ResteasyResponseContainerFilterAdapter.java| 2 +- .../ResteasyWriterInterceptorAdapter.java | 5 +-- .../rest/filter/ServiceInvokeRestFilter.java | 24 ++- .../rest/filter/context/FilterContext.java | 4 ++ .../rest/filter/context/RestFilterContext.java | 23 +++ .../protocol/rest/handler/NettyHttpHandler.java| 14 +++ .../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 ++- .../rest/filter/TraceRequestAndResponseFilter.java | 47 ++ .../dubbo/rpc/protocol/tri/TripleInvoker.java | 3 +- dubbo-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 43 files changed, 369 insertions(+), 155 deletions(-) diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java index 3380621774,03b93bbce3..c3aea739ee --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java @@@ -639,11 -643,5 +639,11 @@@ public interface CommonConstants String DUBBO_PACKABLE_METHOD_FACTORY = "dubbo.application.parameters." + PACKABLE_METHOD_FACTORY_KEY; +String DUBBO_TAG_HEADER = "dubbo-tag"; + +String REST_SERVICE_DEPLOYER_URL_ATTRIBUTE_KEY = "restServiceDeployerAttributeKey"; + - String SERVICE_DEPLOYER_ATTRIBUTE_KEY = "serviceDeployer";String RESTEASY_NETTY_HTTP_REQUEST_ATTRIBUTE_KEY = "resteasyNettyHttpRequest"; ++String SERVICE_DEPLOYER_ATTRIBUTE_KEY = "serviceDeployer"; + String DUBBO_MANUAL_REGISTER_KEY = "dubbo.applicat
[dubbo] 01/01: Merge branch '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 36a80e4db7306a30dff1b6f0ffb076adbd7980c4
Merge: bf3d4f4ca3 c12a57eb3c
Author: Albumen Kevin
AuthorDate: Thu Aug 31 18:59:20 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#
dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/DefaultMetricsCollector.java
#
dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
#
dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
CHANGES.md | 2 +-
.../rpc/cluster/directory/AbstractDirectory.java | 4 +-
.../rpc/cluster/directory/StaticDirectory.java | 8 +-
.../dubbo/common/constants/QosConstants.java | 2 +
.../org/apache/dubbo/config/ApplicationConfig.java | 15 ++
.../main/resources/security/serialize.allowlist| 1 +
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../org/apache/dubbo/config/ServiceConfig.java | 14 ++
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 5 +
dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
.../dubbo-demo-native-consumer/pom.xml | 2 +-
.../dubbo-demo-native-provider/pom.xml | 2 +-
.../dubbo-demo-spring-boot-consumer/pom.xml| 2 +-
.../dubbo-demo-spring-boot-provider/pom.xml| 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 +-
dubbo-demo/dubbo-demo-xml/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 12 +-
.../metrics/collector/CombMetricsCollector.java| 6 +
.../metrics/collector/MethodMetricsCollector.java | 2 +
.../dubbo/metrics/collector/MetricsCollector.java | 3 +
.../dubbo/metrics/data/BaseStatComposite.java | 4 +
.../dubbo/metrics/data/MethodStatComposite.java| 8 +
.../dubbo/metrics/event/MetricsInitEvent.java | 48 ++
.../event/SimpleMetricsEventMulticaster.java | 1 +
.../apache/dubbo/metrics/model/MetricsSupport.java | 5 +
.../dubbo/metrics/model/key/MetricsKeyWrapper.java | 2 +-
.../org/apache/dubbo/metrics/DefaultConstants.java | 25 +++
.../collector/AggregateMetricsCollector.java | 40 -
.../metrics/collector/DefaultMetricsCollector.java | 33 +++-
.../sample/MetricThreadPoolExhaustedListener.java | 2 +-
.../sample/SimpleMetricsCountSampler.java | 4 +
.../sample/ThreadRejectMetricsCountSampler.java| 1 +
.../metrics/collector/InitServiceMetricsTest.java | 152 ++
.../dubbo/metrics/listener/MetricsListener.java| 1 -
.../apache/dubbo/metrics/model/key/MetricsKey.java | 175 ++---
.../metrics/collector/RegistryMetricsTest.java | 7 +-
.../dubbo/qos/protocol/QosProtocolWrapper.java | 5 +
.../registry/client/ServiceDiscoveryRegistry.java | 8 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 12 +-
.../registry/integration/DynamicDirectory.java | 2 +-
.../support/header/HeaderExchangeClient.java | 4 +-
.../support/header/HeaderExchangeClientTest.java | 40 +
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 20 ++-
dubbo-spring-boot/pom.xml | 2 +-
46 files changed, 559 insertions(+), 138 deletions(-)
diff --cc
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 3e6b767b52,2c8d39c4f1..d9d6862255
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@@ -58,9 -61,9 +61,10 @@@ import java.util.ArrayList
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+ import java.util.Optional;
import java.util.TreeSet;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
@@@ -542,10 -545,17 +546,20 @@@ public class ServiceConfig extends S
processServiceExecutor(url);
+if (CollectionUtils.isEmpty(registryURLs)) {
+registerType = RegisterTypeEnum.NEVER_REGISTER;
+}
exportUrl(url, registryURLs, registerType);
+
+ initServiceMethodMetrics(url);
+ }
+
+ private void initServiceMethodMetrics(URL url) {
+ String [] methods =
Optional.ofNullable(url.getParameter(METHODS_KEY)).map(i->i.split(",")).orElse(
new String[]{});
+ Arrays.stream(methods).forEach( method-> {
+ RpcInvocation invocation = new
RpcInvocation(url.getServiceK
[dubbo] 01/01: Merge branch '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 8fefd95a9896d53beb1d83c3a6d89fc9e1d9a633 Merge: 2973426b2a 9837cfbb0b Author: Albumen Kevin AuthorDate: Wed Jul 26 11:22:21 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 2 +- .../apache/dubbo/registry/client/AbstractServiceDiscovery.java | 10 ++ 2 files changed, 7 insertions(+), 5 deletions(-)
[dubbo] 01/01: Merge branch '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 2973426b2a849fa43241025c8a44d8ba43f06767 Merge: 70605f4dd0 879fd81128 Author: Albumen Kevin AuthorDate: Wed Jul 26 10:58:32 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-demo/dubbo-demo-spring-boot/pom.xml # dubbo-dependencies-bom/pom.xml .../common/logger/log4j2/Log4j2LoggerAdapter.java | 8 .../dubbo/common/logger/slf4j/Slf4jLogger.java | 24 ++ .../common/logger/slf4j/Slf4jLoggerAdapter.java| 10 - dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- .../dubbo-demo-spring-boot-consumer/pom.xml| 2 +- .../dubbo-demo-spring-boot-provider/pom.xml| 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 ++-- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 12 +++ .../client/AbstractServiceDiscoveryFactory.java| 7 ++- .../client/ServiceDiscoveryRegistryFactory.java| 5 + .../nacos/NacosServiceDiscoveryFactory.java| 14 + dubbo-spring-boot/pom.xml | 2 +- 15 files changed, 78 insertions(+), 20 deletions(-)
[dubbo] 01/01: Merge branch '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 9bbf7625a862abd2a57269e4e66ef048a3282ef0 Merge: 0d4e8304bc 5f83f10eac Author: Albumen Kevin AuthorDate: Mon Jul 3 16:07:41 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../cluster/support/AbstractClusterInvoker.java| 13 +++- .../dubbo/common/config/ConfigurationUtils.java| 29 +++ .../org/apache/dubbo/config/DubboShutdownHook.java | 4 +- .../filter/support/ConsumerContextFilter.java | 91 ++ .../cluster/loadbalance/AdaptiveLoadBalance.java | 2 +- .../java/org/apache/dubbo/remoting/Constants.java | 7 ++ .../support/header/HeaderExchangeChannel.java | 4 +- .../support/header/HeaderExchangeClient.java | 10 ++- .../support/header/HeaderExchangeHandler.java | 2 +- .../transport/netty/ClientReconnectTest.java | 4 +- .../netty4/NettyPortUnificationServer.java | 2 +- .../remoting/transport/netty4/NettyServer.java | 2 +- .../transport/netty4/ClientReconnectTest.java | 5 +- .../rpc/protocol/ReferenceCountInvokerWrapper.java | 12 ++- .../org/apache/dubbo/rpc/proxy/InvocationUtil.java | 87 +++-- .../dubbo/rpc/protocol/dubbo/ByteAccessor.java | 8 ++ .../dubbo/rpc/protocol/dubbo/DubboCodec.java | 25 -- .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 5 +- .../dubbo/rpc/protocol/dubbo/DubboProtocol.java| 2 +- .../rpc/protocol/dubbo/SharedClientsProvider.java | 3 +- 20 files changed, 206 insertions(+), 111 deletions(-)
[dubbo] 01/01: Merge branch '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 48cc5b24de65ce25fe1f7654d58d85c63cbcc406 Merge: 37f150263a 70a948a3d4 Author: Albumen Kevin AuthorDate: Fri Jun 30 22:45:24 2023 +0800 Merge branch '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 # pom.xml .../rpc/cluster/directory/AbstractDirectory.java | 24 ++ .../cluster/support/AbstractClusterInvoker.java| 2 +- .../support/wrapper/ScopeClusterInvoker.java | 9 .../apache/dubbo/config/spring/ServiceBean.java| 14 + .../annotation/ServiceAnnotationPostProcessor.java | 1 + .../spring/schema/DubboBeanDefinitionParser.java | 3 +++ .../dubbo/config/spring/util/DubboBeanUtils.java | 6 +++--- .../dubbo/config/spring/ServiceBeanTest.java | 4 ++-- .../spring/status/DataSourceStatusCheckerTest.java | 4 ++-- dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo/metrics/data/MethodStatComposite.java| 3 +-- .../dubbo/metrics/data/ServiceStatComposite.java | 5 ++--- .../metrics/collector/DefaultCollectorTest.java| 8 .../dubbo/metrics/filter/MetricsFilterTest.java| 11 +- .../metadata/MetadataMetricsCollectorTest.java | 5 +++-- .../collector/RegistryMetricsCollectorTest.java| 19 + .../client/migration/MigrationInvoker.java | 9 .../registry/integration/RegistryDirectory.java| 6 ++ .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 8 +++- .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 6 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 6 +- 21 files changed, 114 insertions(+), 41 deletions(-)
[dubbo] 01/01: Merge branch '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 da8d0cd9941353bf9d266092dbe5ce20644bc876 Merge: 27e6838c3b 133d0061a7 Author: Albumen Kevin AuthorDate: Wed Jun 28 20:35:33 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../com/alibaba/dubbo/rpc/service/EchoService.java | 0 .../dubbo/rpc/service/GenericException.java| 34 ++--- .../alibaba/dubbo/rpc/service/GenericService.java | 2 +- .../org/apache/dubbo/config/AbstractConfig.java| 3 - .../apache/dubbo/config/AbstractMethodConfig.java | 5 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 3 - .../apache/dubbo/config/ReferenceConfigBase.java | 2 +- .../apache/dubbo/rpc/service/GenericException.java | 141 ++--- .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 1 + dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- .../dubbo-demo-spring-boot-consumer/pom.xml| 2 +- .../dubbo-demo-spring-boot-provider/pom.xml| 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 8 +- .../report/identifier/MetadataIdentifier.java | 4 + .../report/support/AbstractMetadataReport.java | 2 +- .../java/org/apache/dubbo/registry/Constants.java | 4 +- .../dubbo/registry/retry/AbstractRetryTask.java| 2 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 23 +++- .../java/com/alibaba/dubbo/rpc/RpcException.java | 0 .../java/org/apache/dubbo/rpc/AppResponse.java | 7 + .../org/apache/dubbo/rpc/filter/GenericFilter.java | 4 +- .../dubbo/rpc/protocol/dubbo/DubboProtocol.java| 4 +- dubbo-spring-boot/pom.xml | 2 +- 27 files changed, 73 insertions(+), 194 deletions(-)
[dubbo] 01/01: Merge branch '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 d6776e40084b54a00e658983519cd2eb118e72ee Merge: b14201f393 e79e0214cb Author: Albumen Kevin AuthorDate: Thu Jun 22 14:30:33 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../dubbo/common/constants/RegisterTypeEnum.java | 44 ++ .../org/apache/dubbo/config/ServiceConfigBase.java | 12 +-- .../org/apache/dubbo/config/ServiceConfig.java | 97 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 3 +- .../java/org/apache/dubbo/registry/Constants.java | 1 - 5 files changed, 110 insertions(+), 47 deletions(-)
[dubbo] 01/01: Merge branch '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 b14201f393648eb57cdbe4841b9b057823e21d47 Merge: c96a06eba1 f28c2fec72 Author: Albumen Kevin AuthorDate: Thu Jun 22 10:18:31 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryScopeModelInitializer.java # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java README.md | 2 +- .../rpc/cluster/directory/AbstractDirectory.java | 10 +- .../rpc/cluster/directory/StaticDirectory.java | 4 +- .../filter/support/ConsumerContextFilter.java | 2 +- .../DefaultGovernanceRuleRepositoryImpl.java | 2 +- .../cluster/loadbalance/AbstractLoadBalance.java | 3 +- .../loadbalance/ConsistentHashLoadBalance.java | 6 +- .../loadbalance/LeastActiveLoadBalance.java| 5 +- .../rpc/cluster/loadbalance/RandomLoadBalance.java | 3 +- .../cluster/loadbalance/RoundRobinLoadBalance.java | 5 +- .../loadbalance/ShortestResponseLoadBalance.java | 5 +- .../matcher/AbstractConditionMatcher.java | 3 +- .../virtualservice/match/DubboMethodMatch.java | 3 +- .../cluster/router/script/ScriptStateRouter.java | 3 +- .../cluster/support/AbstractClusterInvoker.java| 4 +- .../cluster/support/FailbackClusterInvoker.java| 9 +- .../cluster/support/FailfastClusterInvoker.java| 3 +- .../support/wrapper/MockClusterInvoker.java| 8 +- .../support/wrapper/ScopeClusterInvoker.java | 23 +- .../filter/AbstractObservationFilterTest.java | 3 +- .../filter/ObservationSenderFilterTest.java| 9 +- .../dubbo/common/config/ConfigurationUtils.java| 19 +- .../dubbo/common/config/ModuleEnvironment.java | 2 +- .../dubbo/common/extension/ExtensionLoader.java| 5 +- .../common/threadpool/ThreadlessExecutor.java | 39 +- .../apache/dubbo/common/utils/ToStringUtils.java | 63 +++ .../org/apache/dubbo/config/AbstractConfig.java| 5 +- .../dubbo/config/AbstractInterfaceConfig.java | 2 +- .../dubbo/config/AbstractReferenceConfig.java | 3 + .../java/org/apache/dubbo/config/MethodConfig.java | 2 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 3 + .../apache/dubbo/config/ReferenceConfigBase.java | 1 + .../org/apache/dubbo/config/ServiceConfigBase.java | 21 +- .../config/context/AbstractConfigManager.java | 4 +- .../apache/dubbo/config/nested/ExporterConfig.java | 4 +- .../apache/dubbo/rpc/model/ApplicationModel.java | 6 +- .../org/apache/dubbo/rpc/model/FrameworkModel.java | 2 +- .../org/apache/dubbo/rpc/model/ModuleModel.java| 2 +- .../org/apache/dubbo/rpc/model/ScopeModel.java | 23 +- .../common/config/ConfigurationUtilsTest.java | 4 +- .../dubbo/common/config/EnvironmentTest.java | 4 +- .../common/extension/ExtensionLoaderTest.java | 29 +- .../apache/dubbo/rpc/model/ModuleModelTest.java| 2 +- .../apache/dubbo/rpc/model/ScopeModelUtilTest.java | 2 +- .../java/com/alibaba/dubbo/common/Constants.java | 541 - .../java/com/alibaba/dubbo/rpc/Invocation.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcContext.java | 20 + .../java/com/alibaba/dubbo/rpc/RpcException.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 8 +- .../cluster/loadbalance/AbstractLoadBalance.java | 4 +- .../org/apache/dubbo/config/ReferenceConfig.java | 6 +- .../org/apache/dubbo/config/ServiceConfig.java | 14 +- .../dubbo/config/bootstrap/DubboBootstrap.java | 2 +- .../builders/InternalServiceConfigBuilder.java | 1 + .../config/deploy/DefaultApplicationDeployer.java | 2 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 2 +- .../dubbo/config/utils/ConfigValidationUtils.java | 5 +- .../apache/dubbo/config/AbstractConfigTest.java| 63 ++- .../dubbo/config/ConfigCenterConfigTest.java | 14 +- .../apache/dubbo/config/ConsumerConfigTest.java| 8 +- .../org/apache/dubbo/config/ServiceConfigTest.java | 16 + .../dubbo/config/bootstrap/DubboBootstrapTest.java | 6 +- .../deploy/DefaultApplicationDeployerTest.java | 3 +- .../AbstractRegistryCenterExporterListener.java| 9 +- ...egistryCenterExportProviderIntegrationTest.java | 2 +- ...MultipleRegistryCenterInjvmIntegrationTest.java | 4 +- ...egistryCenterExportProviderIntegrationTest.java | 4 +- .../SingleRegistryCenterInjvmIntegrationTest.java | 4 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provid
[dubbo] 01/01: Merge branch '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 fd14e7b76f0cdc8cebf7db686a07a3b27a95fadd Merge: 642f741dba 2cb12ff9a6 Author: Albumen Kevin AuthorDate: Mon Jun 12 20:52:32 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java # dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java .artifacts | 4 + .../cluster/configurator/AbstractConfigurator.java | 2 +- .../configurator/parser/model/ConditionMatch.java | 18 +++- .../configurator/parser/model/ParamMatch.java | 4 +- .../condition/config/ListenableStateRouter.java| 4 +- .../rpc/cluster/router/tag/TagStateRouter.java | 4 +- .../rpc/cluster/router/tag/model/ParamMatch.java | 2 +- .../support/wrapper/ScopeClusterInvoker.java | 36 +-- .../configurator/parser/ConfigParserTest.java | 18 ++-- .../support/wrapper/ScopeClusterInvokerTest.java | 3 +- .../common/threadpool/ThreadlessExecutor.java | 8 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 13 +++ .../common/threadpool/ThreadlessExecutorTest.java | 13 ++- .../alibaba/dubbo/container/page/PageServlet.java | 2 +- .../main/java/com/alibaba/dubbo/rpc/Invoker.java | 16 +++ .../org/apache/dubbo/config/ReferenceConfig.java | 4 + .../config/deploy/DefaultApplicationDeployer.java | 6 ++ .../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +- .../context/DubboSpringInitCustomizerHolder.java | 2 +- .../src/main/resources/META-INF/dubbo.xsd | 5 + .../support/nacos/NacosDynamicConfiguration.java | 17 +-- .../dubbo/demo/rest/api/JaxRsRestDemoService.java | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-distribution/dubbo-bom/pom.xml | 20 .../dubbo/metadata/AbstractServiceNameMapping.java | 26 ++--- .../apache/dubbo/metadata/rest/PathMatcher.java| 73 +++-- .../dubbo/metadata/rest/ServiceRestMetadata.java | 1 + .../org/apache/dubbo/metadata/PathMatcherTest.java | 35 +++ .../registry/client/ServiceDiscoveryRegistry.java | 4 +- .../registry/integration/RegistryDirectory.java| 12 +++ .../registry/nacos/NacosConnectionManager.java | 6 +- .../java/org/apache/dubbo/remoting/Constants.java | 2 + .../remoting/exchange/support/DefaultFuture.java | 33 -- .../support/header/HeaderExchangeChannel.java | 10 +- .../support/header/HeaderExchangeHandler.java | 10 +- .../exchange/support/DefaultFutureTest.java| 4 +- .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 16 ++- .../dubbo/rpc/protocol/AbstractProtocol.java | 3 +- .../dubbo/rpc/protocol/AbstractProxyProtocol.java | 87 ++-- .../rpc/protocol/rest/PathAndInvokerMapper.java| 26 ++--- .../dubbo/rpc/protocol/rest/RestProtocol.java | 1 - .../rpc/protocol/rest/RestRPCInvocationUtil.java | 109 +-- .../rpc/protocol/rest/constans/RestConstant.java | 5 + .../protocol/rest/handler/NettyHttpHandler.java| 14 ++- .../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 + .../protocol/rest/rest/TestGetInvokerService.java | 30 ++ .../rest/rest/TestGetInvokerServiceImpl.java | 57 ++ .../dubbo-nacos-spring-boot-starter/pom.xml| 44 .../pom.xml| 115 + .../dubbo-zookeeper-spring-boot-starter/pom.xml| 48 + .../observability}/autoconfigure/pom.xml | 0 .../DubboMicrometerTracingAutoConfiguration.java | 0 .../DubboObservationAutoConfiguration.java | 0 .../autoconfigure/ObservabilityUtils.java | 0 .../autoconfigure/ObservationHandlerGrouping.java | 0 .../ObservationRegistryPostProcessor.java | 0 .../ConditionalOnDubboTracingEnable.java | 0 .../brave/BraveAutoConfiguration.java | 0 .../exporter/otlp/OtlpAutoConfiguration.java | 0 .../autoconfigure/exporter/zipkin/HttpSender.java | 0 .../exporter/zipkin/ZipkinAutoConfiguration.java | 0 .../exporter/zipkin/ZipkinConfigurations.java | 0 .../exporter/zipkin/ZipkinRestTemplateSender.java | 0 .../exporter/zipkin/ZipkinWebClientSender.java | 0 .../ZipkinRestTemplateBuilderCustomizer.java | 0 .../ZipkinWebClientBuilderCustomizer.java | 0 .../otel/OpenTelemetryAutoConfiguration.java | 0 .../src/main/resources/META-INF/spring.factories | 0 ...rk.boot.autoconfigure.AutoConfiguration.imports | 0 ...bboMicrometerTracingAutoConfigurationTests.java | 0 .../pom.xml| 0 .../pom.xml
[dubbo] 01/01: Merge branch '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 642f741dba4e8731c0fe8a1d73f35638936c6ad7 Merge: 85bc6ea472 f35ac09353 Author: Albumen Kevin AuthorDate: Thu Jun 8 16:16:15 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java .../rpc/cluster/filter/FilterChainBuilder.java |9 + .../cluster/support/AbstractClusterInvoker.java| 31 +- .../apache/dubbo/common/config/ReferenceCache.java | 12 +- .../common/convert/StringToDurationConverter.java | 243 + .../dubbo/common/deploy/ApplicationDeployer.java |5 + .../org/apache/dubbo/common/utils/ClassUtils.java |4 +- .../apache/dubbo/common/utils/ToStringUtils.java | 26 +- .../dubbo/config/AbstractInterfaceConfig.java | 10 +- .../org/apache/dubbo/config/MetricsConfig.java |9 + .../apache/dubbo/config/ReferenceConfigBase.java | 10 +- .../org/apache/dubbo/config/ServiceConfigBase.java |7 +- .../apache/dubbo/config/context/ConfigManager.java |1 + .../org.apache.dubbo.common.convert.Converter |3 +- .../convert/StringToDurationConverterTest.java | 62 ++ .../java/com/alibaba/dubbo/cache/CacheFactory.java |3 +- .../dubbo/cache/support/AbstractCacheFactory.java |3 +- .../java/com/alibaba/dubbo/common/DelegateURL.java | 1054 .../main/java/com/alibaba/dubbo/common/URL.java|2 +- .../dubbo/common/serialize/Serialization.java |5 +- .../dubbo/common/threadpool/ThreadPool.java|2 +- .../com/alibaba/dubbo/common/utils/UrlUtils.java |7 +- .../java/com/alibaba/dubbo/monitor/Monitor.java|4 +- .../com/alibaba/dubbo/monitor/MonitorFactory.java |2 +- .../com/alibaba/dubbo/registry/NotifyListener.java |3 +- .../java/com/alibaba/dubbo/registry/Registry.java | 10 +- .../alibaba/dubbo/registry/RegistryFactory.java|2 +- .../dubbo/registry/support/AbstractRegistry.java | 22 +- .../registry/support/AbstractRegistryFactory.java |2 +- .../dubbo/registry/support/FailbackRegistry.java | 21 +- .../com/alibaba/dubbo/remoting/Transporter.java|3 +- .../main/java/com/alibaba/dubbo/rpc/Exporter.java |7 + .../main/java/com/alibaba/dubbo/rpc/Filter.java| 11 +- .../main/java/com/alibaba/dubbo/rpc/Invoker.java |3 +- .../main/java/com/alibaba/dubbo/rpc/Protocol.java |3 +- .../java/com/alibaba/dubbo/rpc/ProxyFactory.java |2 +- .../main/java/com/alibaba/dubbo/rpc/Result.java| 10 + .../java/com/alibaba/dubbo/rpc/RpcContext.java |5 +- .../alibaba/dubbo/rpc/cluster/Configurator.java|2 +- .../dubbo/rpc/cluster/ConfiguratorFactory.java |2 +- .../com/alibaba/dubbo/rpc/cluster/LoadBalance.java |8 +- .../java/com/alibaba/dubbo/rpc/cluster/Router.java |5 +- .../alibaba/dubbo/rpc/cluster/RouterFactory.java |2 +- .../alibaba/dubbo/rpc/cluster/RuleConverter.java |2 +- dubbo-config/dubbo-config-api/pom.xml |2 +- .../org/apache/dubbo/config/ReferenceConfig.java | 107 +- .../org/apache/dubbo/config/ServiceConfig.java | 59 +- .../config/deploy/DefaultApplicationDeployer.java | 11 + .../deploy/DefaultMetricsServiceExporter.java |5 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 66 +- .../config/utils/CompositeReferenceCache.java | 18 +- .../dubbo/config/utils/SimpleReferenceCache.java | 27 +- ...egistryCenterExportProviderIntegrationTest.java |4 +- .../dubbo/config/utils/MockReferenceConfig.java|4 +- .../dubbo/config/utils/XxxMockReferenceConfig.java |4 +- .../apache/dubbo/config/spring/ReferenceBean.java | 80 +- .../AbstractAnnotationBeanPostProcessor.java |7 +- .../AnnotationPropertyValuesAdapter.java |8 +- .../annotation/DubboConfigAliasPostProcessor.java |4 +- .../ReferenceAnnotationBeanPostProcessor.java |5 +- .../annotation/ServiceAnnotationPostProcessor.java |7 +- .../factory/annotation/ServiceBeanNameBuilder.java |6 +- ...onfigDefaultPropertyValueBeanPostProcessor.java |6 +- .../context/DubboDeployApplicationListener.java| 61 +- ...pertyDefaultValueDubboConfigBeanCustomizer.java |4 +- .../context/event/DubboModuleStateEvent.java | 55 + .../properties/DefaultDubboConfigBinder.java |5 +- .../spring/reference/ReferenceBeanSupport.java |3 +- .../config/spring/reference/ReferenceCreator.java | 14 +-
[dubbo] 01/01: Merge branch '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 30daba2d7467874f5bbd494dc1d6c5c3442ba039
Merge: 1f39543632 b1612b9269
Author: Albumen Kevin
AuthorDate: Mon May 29 16:01:02 2023 +0800
Merge branch '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-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
# dubbo-plugin/dubbo-qos/pom.xml
# pom.xml
README.md | 6 ++
.../dubbo/common/constants/MetricsConstants.java | 1 +
.../org/apache/dubbo/common/utils/PojoUtils.java | 7 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 96
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 4 +
.../config/deploy/DefaultApplicationDeployer.java | 37 ++--
dubbo-dependencies-bom/pom.xml | 2 +-
.../dubbo/metrics/report/MetricsReporter.java | 4 +
.../sample/MetricThreadPoolExhaustedListener.java | 2 +-
.../sample/MetricsCountSampleConfigurer.java | 22 +
.../collector/sample/MetricsCountSampler.java | 2 -
.../sample/SimpleMetricsCountSampler.java | 21 +
.../metrics/report/DefaultMetricsReporter.java | 100 +
.../report/DefaultMetricsReporterFactory.java} | 23 ++---
...apache.dubbo.metrics.collector.MetricsCollector | 1 +
...che.dubbo.metrics.report.MetricsReporterFactory | 1 +
.../prometheus/PrometheusMetricsReporterCmd.java | 2 +-
.../PrometheusMetricsThreadPoolTest.java | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 6 +-
.../command/impl/DefaultMetricsReporterCmd.java| 69 +-
.../internal/org.apache.dubbo.qos.api.BaseCommand | 1 +
.../dubbo/qos/command/util/CommandHelperTest.java | 2 +
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 5 +-
23 files changed, 286 insertions(+), 130 deletions(-)
diff --cc
dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
index e806704e86,d174a4291f..158704cf00
---
a/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
+++
b/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
@@@ -1,3 -1,3 +1,4 @@@
default-collector=org.apache.dubbo.metrics.collector.DefaultMetricsCollector
aggregateMetricsCollector=org.apache.dubbo.metrics.collector.AggregateMetricsCollector
+configCenterMetricsCollector=org.apache.dubbo.metrics.collector.ConfigCenterMetricsCollector
+
histogramMetricsCollector=org.apache.dubbo.metrics.collector.HistogramMetricsCollector
diff --cc dubbo-plugin/dubbo-qos/pom.xml
index 1affb789b0,6463faf5c2..8bbcd0d435
--- a/dubbo-plugin/dubbo-qos/pom.xml
+++ b/dubbo-plugin/dubbo-qos/pom.xml
@@@ -75,11 -75,10 +75,15 @@@
dubbo-qos-api
${project.version}
-
+
+org.apache.dubbo
+dubbo-native
+${project.parent.version}
+
+
+ org.apache.dubbo
+ dubbo-metrics-default
+ ${project.version}
+
[dubbo] 01/01: Merge branch '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 59758f4b5800407cfab43c7f47be7edbcb30554c Merge: 52e4e4e301 8c2c672f81 Author: Albumen Kevin AuthorDate: Tue May 23 20:00:42 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../support/wrapper/ScopeClusterInvoker.java | 24 + .../cluster/filter/MetricsClusterFilterTest.java | 2 +- .../support/wrapper/ScopeClusterInvokerTest.java | 18 .../dubbo/common/constants/CommonConstants.java| 4 + .../dubbo/common/constants/MetricsConstants.java | 2 + .../dubbo/common/url/component/URLParam.java | 3 +- .../apache/dubbo/common/utils/AnnotationUtils.java | 2 +- .../apache/dubbo/common/utils/ReflectionUtils.java | 5 + .../apache/dubbo/config/AbstractMethodConfig.java | 5 +- .../org/apache/dubbo/config/MetricsConfig.java | 15 ++- .../org/apache/dubbo/common/url/URLParamTest.java | 5 + .../main/java/com/alibaba/dubbo/rpc/Filter.java| 18 +++- .../main/java/com/alibaba/dubbo/rpc/Invoker.java | 17 +++- .../main/java/com/alibaba/dubbo/rpc/Result.java| 45 +++-- .../main/java/com/alibaba/dubbo/rpc/RpcResult.java | 25 +++-- .../java/org/apache/dubbo/filter/FilterTest.java | 20 ++-- .../org/apache/dubbo/filter/LegacyInvoker.java | 6 +- .../java/org/apache/dubbo/filter/MyFilter.java | 5 + .../org/apache/dubbo/config/DubboShutdownHook.java | 14 ++- .../config/deploy/DefaultApplicationDeployer.java | 41 .../dubbo/config/deploy/DefaultModuleDeployer.java | 2 +- .../config/metadata/ExporterDeployListener.java| 11 ++- .../deploy/DefaultApplicationDeployerTest.java | 25 +++-- .../config/spring/util/DubboAnnotationUtils.java | 4 +- .../src/main/resources/META-INF/dubbo.xsd | 6 ++ .../kubernetes/util/KubernetesConfigUtils.java | 2 +- .../collector/ApplicationMetricsCollector.java | 4 +- .../metrics/collector/CombMetricsCollector.java| 28 +++--- .../metrics/collector/MethodMetricsCollector.java | 4 +- .../metrics/collector/ServiceMetricsCollector.java | 6 +- .../metrics/data/ApplicationStatComposite.java | 34 --- .../dubbo/metrics/data/BaseStatComposite.java | 52 +- .../dubbo/metrics/data/MethodStatComposite.java| 17 +++- .../apache/dubbo/metrics/data/RtStatComposite.java | 30 -- .../dubbo/metrics/data/ServiceStatComposite.java | 22 +++-- .../metrics/listener/AbstractMetricsListener.java | 9 +- .../listener/MetricsApplicationListener.java | 20 ++-- .../dubbo/metrics/model/ApplicationMetric.java | 31 +++--- .../apache/dubbo/metrics/model/MethodMetric.java | 107 - .../apache/dubbo/metrics/model/MetricsSupport.java | 87 +++-- .../dubbo/metrics/model/ServiceKeyMetric.java | 46 - .../apache/dubbo/metrics/model/key/MetricsKey.java | 2 + .../dubbo/metrics/model/key/MetricsKeyWrapper.java | 11 ++- .../AbstractMetricsExport.java}| 26 ++--- .../collector/AggregateMetricsCollector.java | 10 +- .../metrics/collector/DefaultMetricsCollector.java | 28 +++--- .../collector/HistogramMetricsCollector.java | 2 +- .../collector/AggregateMetricsCollectorTest.java | 37 --- .../metrics/collector/DefaultCollectorTest.java| 2 +- .../sample/ThreadPoolMetricsSamplerTest.java | 6 +- .../dubbo/metrics/filter/MetricsFilterTest.java| 4 +- .../metrics/metrics/model/MethodMetricTest.java| 14 ++- .../collector/MetadataMetricsCollector.java| 5 +- .../metadata/MetadataMetricsCollectorTest.java | 47 - .../metadata/MetadataStatCompositeTest.java| 59 +++- .../PrometheusMetricsThreadPoolTest.java | 15 ++- .../collector/RegistryMetricsCollector.java| 5 +- .../registry/event/RegistrySubDispatcher.java | 4 +- .../collector/RegistryMetricsCollectorTest.java| 53 +- .../collector/RegistryMetricsSampleTest.java | 3 +- .../collector/RegistryStatCompositeTest.java | 83 +--- .../java/org/apache/dubbo/remoting/Constants.java | 2 + .../exchange/support/header/CloseTimerTask.java| 14 +-- .../support/header/HeaderExchangeServer.java | 17 ++-- .../org/apache/dubbo/remoting/utils/UrlUtils.java | 21 .../apache/dubbo/remoting/utils/UrlUtilsTest.java | 24 + .../remoting/transport/netty4/NettyChannel.java| 6 +- .../transport/netty4/NettyConfigOperator.java | 1 + .../remoting/transport/netty4/NettyServer.java | 5 +- 69 files changed, 776 insertions(+), 553 deletions(-)
[dubbo] 01/01: Merge branch '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 9f0e1589a54c62e0997f0562e9113b75945f0a92
Merge: 471f44b52d ed6afe1ac3
Author: Albumen Kevin
AuthorDate: Mon May 8 08:07:10 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# .licenserc.yaml
.licenserc.yaml| 6 +-
NOTICE | 4 +
.../java/org/apache/dubbo/rpc/model/DubboStub.java | 22 +-
.../main/resources/Dubbo3InterfaceStub.mustache| 2 +-
.../resources/Dubbo3TripleInterfaceStub.mustache | 2 +-
.../src/main/resources/DubboStub.mustache | 2 +-
.../src/main/resources/DubboStub3Single.mustache | 2 +-
.../ReactorDubbo3TripleInterfaceStub.mustache | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 7 +
.../annotation/DubboConfigConfiguration.java | 2 +-
.../dubbo-demo-annotation-consumer/pom.xml | 14 +-
.../dubbo-demo-annotation-provider/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 12 +
dubbo-demo/dubbo-demo-generic-call/pom.xml | 12 +
dubbo-demo/dubbo-demo-interface/pom.xml| 1 +
.../dubbo-demo-native-consumer/pom.xml | 91 +++
.../dubbo-demo-native-provider/pom.xml | 92 +++
.../dubbo-demo-spring-boot-consumer/pom.xml| 10 +
.../dubbo-demo-spring-boot-provider/pom.xml| 9 +
dubbo-demo/dubbo-demo-triple/pom.xml | 16 +
.../dubbo-demo-jaxrs-rest-consumer/pom.xml | 14 +
.../dubbo-demo-jaxrs-rest-provider/pom.xml | 14 +
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml| 14 +
.../dubbo-demo-spring-mvc-rest-provider/pom.xml| 14 +
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 14 +
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 16 +
dubbo-dependencies-bom/pom.xml | 4 +-
dubbo-dependencies/pom.xml | 29 +
dubbo-distribution/dubbo-bom/pom.xml | 31 +
.../metadata/store/redis/RedisMetadataReport.java | 9 +-
.../metrics/aggregate/DubboAbstractTDigest.java| 86 +++
.../metrics/aggregate/DubboMergingDigest.java | 851 +
.../metrics/aggregate/TimeWindowQuantile.java | 6 +-
.../metrics/aggregate/TimeWindowQuantileTest.java | 26 +
.../java/org/apache/dubbo/remoting/Constants.java | 1 +
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 11 +-
.../apache/dubbo/remoting/utils/UrlUtilsTest.java | 9 +
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 22 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 12 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 75 ++
dubbo-test/dubbo-test-check/pom.xml| 1 +
dubbo-test/dubbo-test-common/pom.xml | 5 +-
dubbo-test/dubbo-test-modules/pom.xml | 1 +
dubbo-test/dubbo-test-spring/pom.xml | 16 +-
dubbo-test/dubbo-test-spring3.2/pom.xml| 2 +-
dubbo-test/dubbo-test-spring4.1/pom.xml| 2 +-
dubbo-test/dubbo-test-spring4.2/pom.xml| 2 +-
dubbo-test/pom.xml | 2 +-
pom.xml| 4 +-
50 files changed, 1567 insertions(+), 58 deletions(-)
diff --cc .licenserc.yaml
index 246f8b2db8,f19fa8a6d0..6996c1fb2d
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@@ -97,9 -97,10 +97,11 @@@ header
-
'dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/aot/RunArguments.java'
-
'dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/aot/RunProcess.java'
-
'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/BasicJsonWriter.java'
- -
'dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java'
- -
'dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java'
+ -
'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ExecutableMode.java'
+ -
'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/MemberCategory.java'
+ -
'dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java'
+ -
'dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java'
+-
'dubbo-annotation-processor/src/main/java/org/apache/dubbo/annotation/permit/**'
comment: on-failure
diff --cc dubbo-test/dubbo-dependencies-all/pom.xml
index 30da17a3b1,d98a49f720..590ccb51a3
--- a/dubbo-test/dubbo-dependencies-all/pom.xml
+++ b/dubbo-test/dubbo-dependencies-all/pom.xml
@@@ -65,11 -70,8 +70,12 @@@
org.apache.dubbo
dubbo-config-spring
+ ${project.version}
+
+org.
[dubbo] 01/01: Merge branch '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 992abd2d342c520df842375dc75391ade799dee0 Merge: 9d9df82194 0724e94da7 Author: Albumen Kevin AuthorDate: Fri May 5 13:07:25 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-config/dubbo-config-api/pom.xml # dubbo-distribution/dubbo-all/pom.xml # dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector # pom.xml .artifacts | 5 + .licenserc.yaml| 1 + .../filter/support/MetricsClusterFilter.java | 21 +- .../cluster/support/AbstractClusterInvoker.java| 2 + .../cluster/support/BroadcastClusterInvoker.java | 1 - .../cluster/support/FailbackClusterInvoker.java| 1 - .../cluster/support/FailfastClusterInvoker.java| 1 - .../cluster/support/FailoverClusterInvoker.java| 1 - .../cluster/support/FailsafeClusterInvoker.java| 1 - .../rpc/cluster/support/ForkingClusterInvoker.java | 1 - .../cluster/support/MergeableClusterInvoker.java | 1 - .../support/AvailableClusterInvokerTest.java | 2 +- .../support/FailSafeClusterInvokerTest.java| 15 +- .../support/FailbackClusterInvokerTest.java| 26 +- .../registry/ZoneAwareClusterInvokerTest.java | 2 + .../dubbo/common/constants/CommonConstants.java| 7 + .../dubbo/common/constants/QosConstants.java | 2 + .../org/apache/dubbo/common/lang/Nullable.java | 11 +- .../apache/dubbo/common/utils/ReflectionUtils.java | 150 + .../dubbo/config/AbstractInterfaceConfig.java | 16 +- .../org/apache/dubbo/config/ApplicationConfig.java | 15 + .../java/org/apache/dubbo/config/Constants.java| 2 + .../org/apache/dubbo/config/ProtocolConfig.java| 4 +- .../org/apache/dubbo/config/ServiceConfigBase.java | 32 +- .../org/apache/dubbo/config/TracingConfig.java | 16 + .../apache/dubbo/config/nested/ExporterConfig.java | 79 + .../main/java/org/apache/dubbo/rpc/model/Pack.java | 16 +- .../org/apache/dubbo/rpc/model/PackableMethod.java | 45 +-- .../dubbo/rpc/model/PackableMethodFactory.java | 16 +- .../org/apache/dubbo/rpc/model/ProviderModel.java | 10 + .../java/org/apache/dubbo/rpc/model/UnPack.java| 16 +- .../org/apache/dubbo/rpc/model/WrapperUnPack.java | 13 +- .../alibaba/dubbo/config/ApplicationConfig.java| 13 + .../com/alibaba/dubbo/config/ConsumerConfig.java | 28 ++ .../com/alibaba/dubbo/config/MethodConfig.java | 10 + .../com/alibaba/dubbo/config/ModuleConfig.java | 13 + .../com/alibaba/dubbo/config/ProtocolConfig.java | 6 + .../com/alibaba/dubbo/config/ProviderConfig.java | 36 +++ .../com/alibaba/dubbo/config/ReferenceConfig.java | 34 ++ .../com/alibaba/dubbo/config/ServiceConfig.java| 96 ++ .../main/java/com/alibaba/dubbo/rpc/Exporter.java | 7 + .../org/apache/dubbo/config/ModuleConfigTest.java | 1 + .../org/apache/dubbo/config/SignatureTest.java | 67 .../com.alibaba.dubbo.config.ApplicationConfig | 60 .../com.alibaba.dubbo.config.ArgumentConfig| 29 ++ .../com.alibaba.dubbo.config.ConsumerConfig| 123 +++ .../com.alibaba.dubbo.config.MethodConfig | 81 + .../com.alibaba.dubbo.config.ModuleConfig | 42 +++ .../com.alibaba.dubbo.config.MonitorConfig | 43 +++ .../com.alibaba.dubbo.config.ProtocolConfig| 92 ++ .../com.alibaba.dubbo.config.ProviderConfig| 176 ++ .../com.alibaba.dubbo.config.ReferenceConfig | 130 .../com.alibaba.dubbo.config.RegistryConfig| 69 .../com.alibaba.dubbo.config.ServiceConfig | 150 + dubbo-config/dubbo-config-api/pom.xml | 6 + .../org/apache/dubbo/config/DubboShutdownHook.java | 16 +- .../org/apache/dubbo/config/ServiceConfig.java | 55 .../config/deploy/DefaultApplicationDeployer.java | 49 ++- .../dubbo/config/deploy/DefaultModuleDeployer.java | 32 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../spring/reference/ReferenceBeanSupport.java | 4 +- .../spring/schema/DubboBeanDefinitionParser.java | 5 +- .../src/main/resources/META-INF/dubbo.xsd | 48 +++ .../config/spring/ControllerServiceConfigTest.java | 42 +++ .../config/spring/api/SpringControllerService.java | 16 +- .../registryNA/consumer/DubboXmlConsumerTest.java | 25 +- .../registryNA/consumer/dubbo-consumer.xml | 33 ++ .../consumer/dubbo-registryNA-consumer.xml | 33 ++ .../registryNA/provider/DubboXmlProviderTest.java | 51 +++ .../registryNA/provider/dubbo-provider.xml | 39 +++ .../dubbo-configcenter-apollo/pom.xml
[dubbo] 01/01: Merge branch '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 59832d45d460733bf5788ea11ab99a9e30e312e9 Merge: fe55491d4a 736d9965db Author: Albumen Kevin AuthorDate: Sat Apr 15 07:28:32 2023 +0800 Merge branch '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 # pom.xml .../rpc/cluster/directory/AbstractDirectory.java | 14 +- dubbo-dependencies-bom/pom.xml | 2 +- .../org/apache/dubbo/metrics/MetricsConstants.java | 2 + .../collector/ApplicationMetricsCollector.java | 10 +- .../metrics/collector/CombMetricsCollector.java| 89 + .../dubbo/metrics/collector/MetricsCollector.java | 4 +- .../collector/ServiceMetricsCollector.java}| 34 ++--- .../apache/dubbo/metrics/event/MetricsEvent.java | 25 +++- .../dubbo/metrics/event/MetricsEventBus.java | 12 +- .../metrics/event/MetricsEventMulticaster.java | 4 +- .../event/SimpleMetricsEventMulticaster.java | 4 +- .../metrics/listener/AbstractMetricsListener.java | 70 ++ .../listener/MetricsApplicationListener.java | 54 .../metrics/listener/MetricsLifeListener.java | 4 +- .../metrics/listener/MetricsServiceListener.java | 56 .../dubbo/metrics/model/key/CategoryOverall.java} | 41 +++--- .../apache/dubbo/metrics/model/key/MetricsCat.java | 54 .../dubbo/metrics/model/key/MetricsKeyWrapper.java | 4 - .../dubbo/metrics/model/key/TypeWrapper.java | 10 +- .../event/SimpleMetricsEventMulticasterTest.java | 12 +- .../metrics/filter/MethodMetricsInterceptor.java | 6 +- .../metrics/metadata/MetadataMetricsConstants.java | 20 ++- .../collector/MetadataMetricsCollector.java| 55 ++-- .../metrics/metadata/event/MetadataEvent.java | 53 +++- .../metrics/metadata/event/MetadataListener.java | 67 -- .../event/MetadataMetricsEventMulticaster.java | 87 ++--- .../metrics/metadata/type/ApplicationType.java | 52 .../metadata/MetadataStatCompositeTest.java| 14 +- .../metrics/registry/RegistryMetricsConstants.java | 34 - .../collector/RegistryMetricsCollector.java| 63 ++--- .../metrics/registry/event/RegistryEvent.java | 82 ++-- .../metrics/registry/event/RegistryListener.java | 67 -- .../event/RegistryMetricsEventMulticaster.java | 141 ++--- .../metrics/registry/event/type/ServiceType.java | 50 .../collector/RegistryMetricsSampleTest.java | 7 +- .../collector/RegistryStatCompositeTest.java | 12 +- .../dubbo/rpc/stub/UnaryStubMethodHandler.java | 6 +- 37 files changed, 647 insertions(+), 674 deletions(-)
[dubbo] 01/01: Merge branch '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 fe55491d4aa3c2087dd6bca7dd6a4cf564ed4a80 Merge: b23bae38cc ff4c1e8672 Author: Albumen Kevin AuthorDate: Thu Apr 13 20:32:44 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-common/src/main/java/org/apache/dubbo/common/utils/JsonUtils.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml .artifacts | 107 .github/workflows/build-and-test-pr.yml| 6 +- .github/workflows/build-and-test-scheduled-3.1.yml | 4 +- dubbo-cluster/pom.xml | 11 + .../cluster/configurator/parser/ConfigParser.java | 5 +- .../rpc/cluster/directory/AbstractDirectory.java | 50 +- .../rpc/cluster/directory/StaticDirectory.java | 6 +- .../filter/support}/MetricsClusterFilter.java | 6 +- .../filter/support}/ObservationSenderFilter.java | 39 +- .../rpc/cluster/loadbalance/RandomLoadBalance.java | 20 +- .../config/model/ConditionRuleParser.java | 3 +- .../router/mesh/route/MeshAppRuleListener.java | 6 +- .../router/script/config/model/ScriptRule.java | 3 +- .../cluster/router/tag/model/TagRuleParser.java| 3 +- .../support/wrapper/ScopeClusterInvoker.java | 152 +++-- .../internal/org.apache.dubbo.rpc.cluster.Cluster | 2 +- ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 2 + .../configurator/parser/ConfigParserTest.java | 3 +- .../rpc/cluster/directory/StaticDirectoryTest.java | 14 +- .../filter}/AbstractObservationFilterTest.java | 9 +- .../filter/DefaultFilterChainBuilderTest.java | 5 +- .../cluster/filter/MetricsClusterFilterTest.java | 183 ++ .../dubbo/rpc/cluster/filter/MockInvocation.java | 168 ++ .../filter}/ObservationSenderFilterTest.java | 7 +- .../cluster/loadbalance/LoadBalanceBaseTest.java | 2 +- .../cluster/router/file/FileRouterEngineTest.java | 4 +- .../router/mesh/route/MeshAppRuleListenerTest.java | 15 +- .../router/mesh/route/MeshRuleManagerTest.java | 3 +- .../router/mesh/route/MeshRuleRouterTest.java | 5 +- .../support/AbstractClusterInvokerTest.java| 4 +- .../support/ConnectivityValidationTest.java| 4 +- .../support/FailoverClusterInvokerTest.java| 4 +- .../support/wrapper/MockClusterInvokerTest.java| 4 +- .../wrapper/MockProviderRpcExceptionTest.java | 4 +- .../support/wrapper/ScopeClusterInvokerTest.java | 154 +- dubbo-common/pom.xml | 33 -- .../apache/dubbo/common/BatchExecutorQueue.java| 4 +- .../main/java/org/apache/dubbo/common/Version.java | 128 +++-- .../common/beans/factory/ScopeBeanFactory.java | 4 + .../dubbo/common/constants/CommonConstants.java| 11 +- .../common/constants/LoggerCodeConstants.java | 2 + .../dubbo/common/constants/MetricsConstants.java | 10 +- .../common/deploy/ApplicationDeployListener.java | 1 + .../apache/dubbo/common/deploy/DeployListener.java | 4 + .../dubbo/common/deploy/DeployListenerAdapter.java | 5 + .../apache/dubbo/common/json/impl/JacksonImpl.java | 2 +- .../reporter/FrameworkStatusReportService.java | 6 +- .../common/threadpool/ThreadlessExecutor.java | 127 ++--- .../manager/DefaultExecutorRepository.java | 78 ++- .../threadpool/manager/ExecutorRepository.java | 11 +- .../manager/FrameworkExecutorRepository.java | 11 + .../manager/IsolationExecutorRepository.java | 10 + .../dubbo/common/timer/HashedWheelTimer.java | 2 +- .../dubbo/common/url/component/URLParam.java | 8 +- .../org/apache/dubbo/common/utils/ClassUtils.java | 100 ++-- .../java/org/apache/dubbo/common/utils/JRE.java| 2 +- .../org/apache/dubbo/common/utils/JsonUtils.java | 77 ++- .../org/apache/dubbo/common/utils/NetUtils.java| 11 +- .../org/apache/dubbo/common/utils/PathUtils.java | 5 +- .../org/apache/dubbo/common/utils/PojoUtils.java | 110 ++-- .../apache/dubbo/common/utils/ReflectUtils.java| 8 +- .../utils/SerializeSecurityConfigurator.java | 2 +- .../org/apache/dubbo/common/utils/StringUtils.java | 2 +- .../dubbo/config/AbstractInterfaceConfig.java | 14 +- .../dubbo/config/AbstractReferenceConfig.java | 5 + .../org/apache/dubbo/config/ApplicationConfig.java | 20 +- .../org/apache/dubbo/config/MetricsConfig.java | 56 +- .../org/apache/dubbo/config/TracingConfig.java | 90 +++ .../config/context/AbstractConfigManager.java | 43 +- .../apache/dubbo/config/context/ConfigManager.java | 32 +- .../dubbo/config/context/ModuleConfigManager.java |
[dubbo] 01/01: Merge branch '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 414785c05b5d3cb9691a2940c0e5fa17c69a52b3 Merge: 52611099ab 7bc8de4de9 Author: Albumen Kevin AuthorDate: Tue Mar 21 17:49:14 2023 +0800 Merge branch '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 # pom.xml .github/workflows/build-and-test-pr.yml| 21 +- .github/workflows/build-and-test-scheduled-3.1.yml | 8 +- .github/workflows/build-and-test-scheduled-3.2.yml | 8 +- .github/workflows/release-test.yml | 8 +- .gitignore | 5 +- .licenserc.yaml| 37 +- README.md | 16 +- codestyle/checkstyle-suppressions.xml | 3 +- dubbo-cluster/pom.xml | 12 + .../dubbo/rpc/cluster/ConfiguratorFactory.java | 3 +- .../org/apache/dubbo/rpc/cluster/Constants.java| 6 +- .../apache/dubbo/rpc/cluster/RouterFactory.java| 3 +- .../cluster/configurator/AbstractConfigurator.java | 153 ++--- .../override/OverrideConfigurator.java | 4 + .../cluster/configurator/parser/ConfigParser.java | 21 +- .../configurator/parser/model/ConditionMatch.java | 98 ++ .../configurator/parser/model/ConfigItem.java | 32 +- .../parser/model/ConfiguratorConfig.java | 1 + .../configurator/parser/model/ParamMatch.java | 58 .../rpc/cluster/directory/AbstractDirectory.java | 54 ++- .../DefaultGovernanceRuleRepositoryImpl.java | 2 +- .../cluster/loadbalance/AdaptiveLoadBalance.java | 2 +- .../rpc/cluster/loadbalance/RandomLoadBalance.java | 4 +- .../cluster/loadbalance/RoundRobinLoadBalance.java | 4 +- .../loadbalance/ShortestResponseLoadBalance.java | 6 +- .../rpc/cluster/router/AbstractRouterRule.java | 11 + .../router/condition/ConditionStateRouter.java | 227 - .../condition/config/AppStateRouterFactory.java| 2 + .../condition/config/ListenableStateRouter.java| 4 +- .../condition/config/ProviderAppStateRouter.java | 77 + .../config/ProviderAppStateRouterFactory.java | 36 ++ .../matcher/AbstractConditionMatcher.java | 138 .../router/condition/matcher/ConditionMatcher.java | 61 .../condition/matcher/ConditionMatcherFactory.java | 43 +++ .../matcher/argument/ArgumentConditionMatcher.java | 72 .../argument/ArgumentConditionMatcherFactory.java | 37 ++ .../attachment/AttachmentConditionMatcher.java | 76 + .../AttachmentConditionMatcherFactory.java | 37 ++ .../matcher/param/UrlParamConditionMatcher.java| 41 +++ .../param/UrlParamConditionMatcherFactory.java | 36 ++ .../condition/matcher/pattern/ValuePattern.java| 47 +++ .../matcher/pattern/range/RangeValuePattern.java | 84 + .../pattern/wildcard/WildcardValuePattern.java | 41 +++ .../cluster/router/mesh/route/MeshRuleCache.java | 7 +- .../rule/virtualservice/match/AddressMatch.java| 80 + .../rule/virtualservice/match/StringMatch.java | 15 +- .../script/config/AppScriptRouterFactory.java | 32 ++ .../router/script/config/AppScriptStateRouter.java | 150 .../router/script/config/model/ScriptRule.java | 70 .../cluster/router/state/AbstractStateRouter.java | 4 +- .../dubbo/rpc/cluster/router/state/BitList.java| 2 +- .../cluster/router/state/StateRouterFactory.java | 3 +- .../rpc/cluster/router/tag/TagStateRouter.java | 47 ++- .../rpc/cluster/router/tag/model/ParamMatch.java | 47 +++ .../dubbo/rpc/cluster/router/tag/model/Tag.java| 36 +- .../cluster/router/tag/model/TagRouterRule.java| 61 +++- .../cluster/router/tag/model/TagRuleParser.java| 3 +- .../cluster/support/AbstractClusterInvoker.java| 2 +- .../cluster/support/wrapper/AbstractCluster.java | 9 +- .../support/wrapper/ScopeClusterInvoker.java | 225 .../support/wrapper/ScopeClusterWrapper.java | 46 +++ .../internal/org.apache.dubbo.rpc.cluster.Cluster | 3 +- ...outer.condition.matcher.ConditionMatcherFactory | 4 + ...r.router.condition.matcher.pattern.ValuePattern | 2 + ...bbo.rpc.cluster.router.state.StateRouterFactory | 2 + .../apache/dubbo/rpc/cluster/ConfiguratorTest.java | 2 +- .../apache/dubbo/rpc/cluster/RouterChainTest.java | 10 +- .../override/OverrideConfiguratorTest.java | 79 + .../configurator/parser/ConfigParserTest.java | 71 .../rpc/cluster/directory/StaticDirectoryTest.java | 3 + .../filter/DefaultFilterChainBuilderTest.java | 8 +- .../clu
