Commit Graph

823 Commits

Author SHA1 Message Date
Albumen Kevin da2dd6d2a1 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
2024-03-12 11:36:55 +08:00
aofall 36e0cf5490
fix(#13305): RpcContext local address info get null on custom filter (#13751)
* fix(#13305): RpcContext local address info get null on custom filter

* fix ci build failed

* fix ci build failed
2024-03-11 14:00:16 +08:00
Albumen Kevin 76390eed4e Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	dubbo-dependencies-bom/pom.xml
#	dubbo-spring-boot/pom.xml
2024-03-05 09:47:49 +08:00
Albumen Kevin 17b75a7895
Refresh valid invokers after connectivity check (#13773) 2024-02-29 11:26:11 +08:00
J.Son 6dbac54b39
'blacklist' renamed to 'blocklist' (#13800) 2024-02-26 17:11:10 +08:00
Albumen Kevin 70b1ecb662 Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	dubbo-dependencies-bom/pom.xml
2024-02-20 11:27:00 +08:00
Albumen Kevin caed64b2a6
Fix #13750, ConsistentHashLoadBalance not base on arguments (#13753) 2024-02-19 10:00:19 +08:00
Albumen Kevin c38fa0ac8b Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	.editorconfig
#	dubbo-build-tools/pom.xml
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	dubbo-native-plugin/pom.xml
#	dubbo-spring-boot/pom.xml
2024-01-19 15:19:31 +08:00
namelessssssssssss 1bdbfd8647
Fix MergeableClusterInvoker log issue (#13593)
* Fix MergeableClusterInvoker log issue

* Code style fix

* Update log level

* Update log level

* Update log level

* Add exception stacktrace
2024-01-02 18:58:43 +08:00
huazhongming 36e0ee0a96
Revert dubbo module refactor (#13541)
* Revert dubbo module refactor

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Revert dubbo module refactor

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Revert dubbo module refactor

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

---------

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2023-12-21 10:17:43 +08:00
Sean Yang a53228d545
feat(logging): #13378 Uniformly uses log4j2 as the logging component (#13402) 2023-11-22 09:58:59 +08:00
huazhongming d979b211ce
[3.3]Use spotless to format the code (#13322)
* Use spotless to format the code

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Use spotless to format the code

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Use spotless to format the code

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* degrade dubbo version

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* degrade dubbo version

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* revert degrade dubbo version

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Fix ut

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

---------

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2023-11-07 15:41:45 +08:00
huazhongming 730695a7a2
[3.2]Use spotless to format the code (#13320)
* Use spotless to format the code

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

* Support develop with JDK 21

Signed-off-by: crazyhzm <crazyhzm@gmail.com>

---------

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2023-11-07 15:40:13 +08:00
crazyhzm 35b6682393 Merge remote-tracking branch 'upstream/3.2' into 3.3
# Conflicts:
#	dubbo-cluster/pom.xml
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java
#	dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
#	dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
#	dubbo-demo/dubbo-demo-spring-boot/pom.xml
#	dubbo-dependencies-bom/pom.xml
#	dubbo-metadata/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/rest/ParamType.java
#	dubbo-spring-boot/pom.xml
2023-11-06 13:29:10 +08:00
Sean Yang 539bb11ae7
fix(pom): #13188 Exclude unnecessary transitive dependencies for zookeeper & cleanup pom (#13230) 2023-11-02 09:54:33 +08:00
Albumen Kevin c22a40b87d
Fix unit tests failed on JDK8 (#13296) 2023-11-02 09:52:31 +08:00
Albumen Kevin 0562b64828 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
2023-10-18 19:02:54 +08:00
andotorg 4782142980
Fix #13135 for testing (#13139)
* fix https://github.com/apache/dubbo/issues/13135

* fix Using the '.*' form of import should be avoided build error

* nashorn-core jar scope is test
2023-10-13 17:43:30 +08:00
crazyhzm 0f61286a78 Merge branch '3.2' into 3.3
# Conflicts:
#	dubbo-dependencies-bom/pom.xml
2023-09-20 15:32:19 +08:00
songxiaosheng 575c3392ec
Service metrics (#13033)
*  support service metric level

*  support service metric level

*  support service metric level

*  support service metric level

*  add ServiceMetricsTest

*  add ServiceMetricsTest

*  add ServiceMetricsTest

*  servicelevel config init opt

*  servicelevel config init opt

*  servicelevel config init opt

*  servicelevel config init opt

*  servicelevel config init opt

---------

Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-09-19 10:22:58 +08:00
Albumen Kevin ade91c9b69
Fix unit test cases (#13076) 2023-09-19 10:19:23 +08:00
Albumen Kevin 3ed2dacbef 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
2023-09-11 17:16:07 +08:00
Albumen Kevin 8d9817f8af
Publish directory refresh event after connectivity check (#12988) 2023-08-31 19:30:36 +08:00
Albumen Kevin 36a80e4db7 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
2023-08-31 18:59:20 +08:00
namelessssssssssss bf3d4f4ca3
Metrics event split (#12888)
* Split event-related api out of dubbo-metrics-api.

* Add new module to .artifacts

* Temporary remove dubbo-plugin-metrics

* Fix pom

* * Remove the use of dispatcher name

* * Bug fix

* * Bug fix

* Update ScopeClusterInvokerTest.java

* * Trigger test

* * Fix ut

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
2023-08-31 08:02:41 +08:00
TomlongTK c12a57eb3c
enhance application discovery toString (#12953) 2023-08-29 16:14:52 +08:00
Albumen Kevin f5cc40c56a
Fix static directory metrics label (#12951)
* Fix static directory metrics label

* Fix import
2023-08-23 15:39:52 +08:00
Albumen Kevin 7a4ec6c525 Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	README.md
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	dubbo-metadata/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/rest/springmvc/SpringMvcServiceRestMetadataResolver.java
#	dubbo-metadata/dubbo-metadata-rest/src/test/java/org/apache/dubbo/metadata/rest/NoAnnotationApiDemoResolverTest.java
#	dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java
#	dubbo-monitor/dubbo-monitor-common/src/main/java/org/apache/dubbo/monitor/support/CallbackConsumerContextFilter.java
#	pom.xml
2023-08-22 15:05:41 +08:00
wxbty 0add70e3f5
Support multi registries metrics key (#12582)
* init

* fix

* fix

* fix

* fix

* add licence

* fix testcase

* fix testcase

* lowcase

* remove unuse

* opt notify&directory

* fix post&finish

* revert name

* move registerMetadataAndInstance

* move metrics from

* remove some unuse

* remove unuse

* fix style

* fix style

* remove unuse

* remove unuse

* fix default&& move post

* add multi registry lables for subscribe

* fix

* fix url

* fix url

* Fix uts

* add registry key for directory

* Compatible with empty registry keys

* remove unus

* Support registry type

* Fix attachment

* Code enhancement

* Fix registry key

* Fix service discovery notify

* fix

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-07-31 13:44:46 +08:00
PiteXChen e93c5cf777
RequestEvent optimization (#12655)
* RequestEvent optimization

* RequestEvent optimization

* RequestEvent optimization(#12655)

* RequestEvent optimization(#12655)

* fix conflict

* code optimize

* code optimize

* optimize

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
2023-07-30 09:44:52 +08:00
Albumen Kevin 093fb7c208 Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
#	dubbo-config/dubbo-config-api/pom.xml
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.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/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java
#	dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyHttpRestServer.java
#	dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/deploy/ServiceDeployer.java
#	dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/handler/NettyHttpHandler.java
#	dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/JsonCodec.java
#	pom.xml
2023-07-19 15:18:51 +08:00
Albumen Kevin ff60c870ed
Skip warn if provider app and consumer app are the same (#12729) 2023-07-15 10:15:38 +08:00
Albumen Kevin d2eb2ba3d7
Performance opt (#12680) 2023-07-11 14:42:33 +08:00
Albumen Kevin 9bbf7625a8 Merge branch 'apache-3.2' into apache-3.3 2023-07-03 16:07:41 +08:00
qinliujie 0d4e8304bc
refactor dubbo module (#12276)
* refactor:extract MergeableCluster as a single module

* fix:add license header

* fix:add dubbo-plugin-cluster-mergeable to .artifacts

* refactor:extract module from dubbo-cluster

* refactor:extract dubbo-plugin-router-condition module

* refactor:extract dubbo-plugin-router-tag module

* refactor:move metric filter out from dubbo-cluster

* refactor:add pom dependency

* fix:ut and dependency

* fix:ut

* refactor:extract dubbo-plugin-loadbalance-adaptive

* refactor:extract dubbo-remoting-zookeeper-api module

* refactor:extract dubbo-configcenter-file module

* refactor:extract dubbo-metadata-rest module

* refactor:extract dubbo-monitor-common module

* refactor: extrace dubbo-plugin-access-log module

* refactor: extrace dubbo-plugin-tps module

* refactor: extrace dubbo-plugin-token module

* refactor: extract dubbo-plugin-generic-invoke module

* refactor: extract dubbo-plugin-context module

* refactor: extract dubbo-plugin-classloader-filter module

* refactor: extract dubbo-plugin-proxy-bytebuddy module

* refactor: extract dubbo-plugin-qos-trace module

* refactor: extract FutureFilter from dubbo protocol module

* refactor: add modules to pom

* ut:fix ut dependency
2023-07-03 15:55:42 +08:00
Albumen Kevin 7264850fd4
Fix service context early restore (#12643) 2023-07-03 10:26:08 +08:00
why技术 33f688e404
Update AdaptiveLoadBalance.java (#12636)
fix getTimeout bug
2023-07-02 16:00:47 +08:00
xixingya 94e7244eb0
fix the consumer remoteApplication is null (#12635)
* fix the consumer remoteApplication is null

* fix the consumer remoteApplication is null

* fix the consumer remoteApplication is null

* fix the consumer remoteApplication is null
2023-07-02 09:35:28 +08:00
Albumen Kevin 48cc5b24de 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
2023-06-30 22:45:24 +08:00
Albumen Kevin c05127e360
Pretty invokers toString format (#12618) 2023-06-29 19:34:37 +08:00
conghuhu 95207b9079
fix: fix missing metrics filter & recover #12453 (#12577)
* recover "refactor: migrate tracing core from boot-start to dubbo deployer (#12453)"

This reverts commit ea35f7ed5c.

* fix: fix missing metrics filter

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-06-28 20:36:38 +08:00
Albumen Kevin ea35f7ed5c Revert "refactor: migrate tracing core from boot-start to dubbo deployer (#12453)"
This reverts commit a613cae2
2023-06-20 10:02:30 +08:00
Albumen Kevin f81c3f3a44
Cache interfaceClass in advance to prevent IndexOutOfBoundsException (#12567) 2023-06-19 18:56:01 +08:00
wxbty 913e66e965
Supplementary dirctory metrics data push (#12539)
* Supplementary dirctory metrics data push

* puplish after publish
2023-06-19 17:37:37 +08:00
Albumen Kevin a4e9c9efa4
Fix local invoke consumer url override (#12553) 2023-06-19 09:34:29 +08:00
Albumen Kevin 3160602072
Rename getModelEnvironment to modelEnvironment (#12551) 2023-06-19 09:34:06 +08:00
conghuhu a613cae2f3
refactor: migrate tracing core from boot-start to dubbo deployer (#12453)
Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
2023-06-17 19:54:12 +08:00
Albumen Kevin e07e5e294b
Fix get method name from invocation (#12519)
* Fix get method name from invocation

* fix compile
2023-06-13 20:25:25 +08:00
Ken Liu dd94c1561a
fix router match condition (#12491)
* fix router match condition

* fix ut compilation

* add null check
2023-06-12 20:48:03 +08:00
Ken Liu 3fa518505f
Add log for remote configuration. (#12294)
* add log for remote configuration.

* Give dynamic routing rule notification 'info'  log level.

* remove unused imports

* revert warn log change

* fix import

---------

Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-06-12 20:30:42 +08:00