Commit Graph

6087 Commits

Author SHA1 Message Date
Simon Convent efb83f8285
Bump Maven Wrapper to 3.8.7 (#11260) 2023-01-12 10:16:56 +08:00
dependabot[bot] f1cf9f21bf
Bump protobuf-java in /dubbo-demo/dubbo-demo-triple (#11281)
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.18.3 to 3.19.6.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.18.3...v3.19.6)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-12 07:52:35 +08:00
dependabot[bot] f3afca8eae
Bump protobuf-java from 3.18.3 to 3.19.6 in /dubbo-dependencies-bom (#11284)
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.18.3 to 3.19.6.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.18.3...v3.19.6)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-12 07:52:21 +08:00
dependabot[bot] 2917e65ccd
Bump protobuf-java from 3.18.3 to 3.19.6 in /dubbo-xds (#11283)
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.18.3 to 3.19.6.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.18.3...v3.19.6)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-12 07:52:08 +08:00
dependabot[bot] 7c305bbb68
Bump protobuf-java from 3.18.3 to 3.19.6 in /dubbo-rpc/dubbo-rpc-triple (#11282)
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.18.3 to 3.19.6.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.18.3...v3.19.6)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-12 07:51:41 +08:00
Albumen Kevin f42f21bce8 Fix test conflict 2023-01-11 15:29:41 +08:00
Albumen Kevin 7237e8baae Fix conflict for Nacos 2023-01-11 15:21:56 +08:00
Albumen Kevin 44fc2a6c2e Fix conflict 2023-01-11 15:05:56 +08:00
Albumen Kevin a278feb372 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
#	dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
#	dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapper.java
#	dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java
#	dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
#	dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapperTest.java
#	dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java
2023-01-11 15:05:01 +08:00
Albumen Kevin 67993e168e
Switch default check level (#11279) 2023-01-11 15:01:16 +08:00
Albumen Kevin fc00efd704
Fix test cases for service name mapping (#11280) 2023-01-11 14:30:19 +08:00
Albumen Kevin 84c1c35aae
Add serialization check (#11217) 2023-01-11 11:41:52 +08:00
Albumen Kevin 671c7ff950
Enhance nacos regsitry (#11262) 2023-01-11 11:04:52 +08:00
Albumen Kevin 213363422e
Add mapping retry (#11265) 2023-01-11 10:47:37 +08:00
HHoflittlefish777 c06c11c754
update IPv6 annotation and filter invalid IPv6 (#11266) 2023-01-10 14:44:51 +08:00
Albumen Kevin 3d64f1192d
Update protobuf-java version in both dependency and plugin (#11261) 2023-01-10 14:13:12 +08:00
Albumen Kevin fbbca9d405
Fix config unable to serialize (#11267) 2023-01-10 14:12:17 +08:00
huazhongming a20787379b
fix native (#11263)
Signed-off-by: crazyhzm <crazyhzm@gmail.com>

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2023-01-10 11:53:16 +08:00
songxiaosheng b7b7ddfc58
jvm meter add application name label (#11255)
* fix MetericsService resource location bug

* 🎨为jvm指标增加dubbo应用名称

* 🎨 jvm meter add application name label

* fix unit test failure
2023-01-10 11:35:39 +08:00
Xingpeng Li d8e6dfa42a
fix: code format (#11258)
* fix: code format

* fix: code format

* fix: code format
2023-01-09 20:02:29 +08:00
Albumen Kevin 84b152f40c Merge branch 'apache-3.1' into apache-3.2 2023-01-08 18:06:49 +08:00
Albumen Kevin bbae7db017
Fix cas log parameter (#11253) 2023-01-08 16:19:47 +08:00
Albumen Kevin 889fbcce5a
Add some cas update failed logs (#11251) 2023-01-08 15:55:59 +08:00
Albumen Kevin 0419f25ac2 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
2023-01-06 16:48:39 +08:00
Albumen Kevin c2eef7b5ce
Fix zk resubscribe failed (#11247) 2023-01-06 16:47:30 +08:00
Albumen Kevin 36c9edc8ed
Fix Multi Registry Override (#11245) 2023-01-06 16:46:05 +08:00
Albumen Kevin 4a1aa856ab
Store old revisions (#11241) 2023-01-06 16:36:59 +08:00
aamingaa 4188b884b2
Feature/modify xds subscribe (#10885)
Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-01-06 15:16:53 +08:00
Albumen Kevin f16febe70d
Update NOTICE 2023-01-06 15:10:02 +08:00
Albumen Kevin d66349f982
Fix app level configuration not work (#11215) 2023-01-05 20:45:59 +08:00
jojocodeX 32db2636bd
Added metrics for limit and timeout (#11244) 2023-01-05 20:01:09 +08:00
Albumen Kevin 4b4de1dd74
Enhance nacos service discovery update (#11239) 2023-01-05 10:36:29 +08:00
Albumen Kevin e87d896352 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java
2023-01-05 10:26:24 +08:00
Albumen Kevin ad79c9e8fd
Fix service instance update failed (#11236) 2023-01-05 10:17:14 +08:00
Albumen Kevin ece5f4fb74 Merge branch 'apache-3.1' into apache-3.2 2023-01-05 10:10:35 +08:00
Albumen Kevin 2492881674
Optimize MetadataServiceNameMapping cas report conflict (#11237)
* Optimize MetadataServiceNameMapping cas report conflict

* Fix uts
2023-01-05 10:09:56 +08:00
Albumen Kevin 4f5c245aea fix conflict 2023-01-04 17:37:47 +08:00
Albumen Kevin b8ea46d038 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/ConnectionHandler.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java
2023-01-04 17:36:49 +08:00
Andy Cheung 34168e6d0e
Merge error code 3-3 to 3-8, 6-4 to 99-0. (#11225)
* Replace LoggerCodeConstants.java with 3.2 branch.

* Add hints in the constant file.

* Add hints in the constant file. (2)

* Merge 3-3 to 3-8.

* 6-4 -> 99-0.

* 6-4 -> 99-0.

* 6-4 -> 99-0.

* 6-4 -> 99-0. (4)

* 6-4 -> 99-0. (5, Compatible)

* Change AbstractH2TransportListener's error code per @EarthChen's request.
2023-01-03 15:03:55 +08:00
earthchen 2765deb98d
fix tri upper error (#11214)
* fix error

* fix

* fix

* fix

* fix

* fix
2022-12-31 13:41:31 +08:00
Albumen Kevin 73969703b1
Add some qos command logs (#11224)
* Add some qos command logs

* Add some qos command logs

* Fix tests
2022-12-30 20:34:44 +08:00
ShenFeng312 854d85953d
fix #11033 (#11144) 2022-12-30 16:27:16 +08:00
Albumen Kevin 3375f727e1 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	.github/workflows/build-and-test-pr.yml
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
2022-12-30 15:53:09 +08:00
Albumen Kevin f03f374397
Enhance Zookeeper ServiceDiscovery update (#11220) 2022-12-30 15:52:26 +08:00
Andy Cheung 2c6a933d3a
Change some test-related error code to a separate series. (#11219)
* Revert changes in FailsafeLoggerTest.

* COMMON_FAILED_REFLECT -> COMMON_REFLECTIVE_OPERATION_FAILED. Add 81-1.

* 1-25 -> 81-2.

* 1-23 / 5-19 -> 81-3 / 81-4.
2022-12-30 15:50:42 +08:00
Albumen Kevin f5df7edcdf resolve conflict 2022-12-29 17:33:56 +08:00
Albumen Kevin 0e4997b252 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
#	dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
2022-12-29 17:33:02 +08:00
Albumen Kevin e86e6e3209
Fix zookeeper instance update (#11212) 2022-12-29 17:12:33 +08:00
Albumen Kevin 1ecc00a713
Fix Nacos empty ticket not work (#11213) 2022-12-29 11:14:08 +08:00
Andy Cheung 992e125a1a
Merge error code 1-36 to 99-0. (#11207)
* Merge 1-36 to 99-0.

* Merge 1-36 to 99-0. (2)

* Merge 1-36 to 99-0. (3)

* Merge 1-36 to 99-0. (4)
2022-12-27 11:43:51 +08:00