Commit Graph

204 Commits

Author SHA1 Message Date
Albumen Kevin 32f4cb53df 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
2024-05-24 10:01:37 +08:00
xiaosheng 23599941e7
⬆️ upgrade micrometer to 1.13 (#14228)
* ⬆️ upgrade micrometer to 1.13

* ⬆️ upgrade micrometer to 1.13
2024-05-24 09:52:04 +08:00
Albumen Kevin fa16bed3a3 Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
#	dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorTest.java
#	dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java
#	dubbo-remoting/dubbo-remoting-http12/pom.xml
2024-05-13 14:49:07 +08:00
Kaiyao Ke 8e2eb332a1
fixed non-idempotent unit tests (#14172) 2024-05-11 00:27:46 +08:00
conghuhu b14e5e3a12
fix: fix observationsender error & feat: add DubboTracingObservationHandler (#13818) 2024-03-07 09:33:40 +08:00
wxbty 50612ad3a7
Revert 13609 due to misoperation (#13634)
* Revert "add test ci"

This reverts commit 4c528230eb.

* Revert "fix"

This reverts commit 20e0b57a81.
2024-01-09 21:34:27 +08:00
wxbty 4c528230eb add test ci 2024-01-09 20:56:08 +08:00
Albumen Kevin d018475f73 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
2023-12-27 23:27:35 +08:00
Albumen Kevin 745ba45ea4
Fix MethodKeyRt override & Error enhance (#13580)
Co-authored-by: xiaosheng <songxiaosheng@apache.org>
2023-12-27 23:20:10 +08:00
huazhongming 5b0b86b11d
Remove dubbo monitor module (#13456)
Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2023-12-18 14:11:33 +08:00
crazyhzm c302fcccd8 Merge branch '3.2' into 3.3
# Conflicts:
#	dubbo-build-tools/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
#	pom.xml
2023-12-04 19:53:18 +08:00
xiaosheng 58fa120795
🐛 fix metrics servce level config bug (#13449)
* 🐛 fix metrics servce level config bug

* 🐛 fix metrics servce level config bug

* 🐛 fix metrics servce level config bug

* 🐛 fix metrics servce level config bug
2023-12-04 09:34:47 +08:00
Albumen Kevin 40201078b0 Fix compile 2023-11-30 14:00:44 +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
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 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
Albumen Kevin a709b2803c Fix conflicts 2023-10-08 14:55:51 +08:00
Albumen Kevin 1848e400a0 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-api/src/main/java/org/apache/dubbo/metrics/data/BaseStatComposite.java
#	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/ThreadPoolMetricsSampler.java
#	dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadRejectMetricsCountSampler.java
#	pom.xml
2023-10-08 14:46:26 +08:00
Albumen Kevin 8b0bd8a043
Remove duplicated class (#13144) 2023-09-30 10:38:24 +08:00
Albumen Kevin 70600eb632
Add metrics version compare (#13104) 2023-09-30 10:06:21 +08:00
crazyhzm d050b9c6ec Merge branch '3.2' into 3.3 2023-09-28 17:17:17 +08:00
Albumen Kevin 34c5bbf713
Support customize collector sync period (#13140) 2023-09-28 11:09:06 +08:00
songxiaosheng 5903d0be8d
opt unuse label (#13034)
*  opt unuse label

*  opt unuse label

* ♻️ application metrics add commit id

* ♻️ refact application tag name

*  remove unuse test line

*  add application metrics test

*  remove unuse test line

*  remove unuse test line
2023-09-25 19:27:29 +08:00
Albumen Kevin da801bf177
Remove identity hash code usage (#13112) 2023-09-25 18:43:04 +08:00
Albumen Kevin 705d96e9f6
Fix uts on 3.2 (#13090) 2023-09-21 14:07:14 +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
Albumen Kevin 139a62ebb9
Fix qps time window unit (#13077) 2023-09-19 10:23:24 +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
wxbty e887bab83b
remove unuse code (#13036)
Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
2023-09-12 20:21:38 +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 4c4bcb7a25
Support disable metrics init and sync (#13025) 2023-09-10 17:18:22 +08:00
namelessssssssssss 7e6a32ba68
* Fix conflict (#12991) 2023-09-01 10:26:02 +08:00
Albumen Kevin 025c078948
Check before init agg metrics (#12989) 2023-08-31 19:30:27 +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
robin977 711de7c2a0
Adds metrics initialization metrics for the service interface(#12850) (#12892)
* Fixed the observable collection thread pool indicator

* Adds metrics initialization metrics for the service interface(#12850)

---------

Co-authored-by: robin <pengrobin607@gmail.com>
Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-08-26 20:54:08 +08:00
Albumen Kevin 9d7c1b62bd Revert " avoid use string.format (#12816)"
This reverts commit bac06929f2.
2023-08-23 11:17:15 +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
songxiaosheng b87746b19f
🚑 add more metrics catch (#12917) 2023-08-16 20:04:25 +08:00
Albumen Kevin 90cae426ab
Fix DubboMergingDigest concurrent issue (#12913) 2023-08-16 15:42:05 +08:00
conghuhu 629bee3987
feat: add brave to core (#12814) 2023-08-14 15:42:40 +08:00
namelessssssssssss 5ae875d951
Add support for error code metrics (#12125) (#12661)
* Add metrics support of error code

* Add metrics support of error code

* Add metrics support of error code

* add license

* remove hashcode override

* Update DefaultSubDispatcher.java

* Update ErrorCodeSampleTest.java

* Update DefaultMetricsCollector.java

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
2023-08-09 17:56:47 +08:00
songxiaosheng bac06929f2
avoid use string.format (#12816)
*  avoid use string.format

*  avoid use string.format

*  avoid use string.format

---------

Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
2023-08-09 16:05:04 +08:00
胡俊 04f3fe7d2b
add netty4 metrics. (#12695) 2023-08-09 15:46:03 +08:00
songxiaosheng 1b8688c179
🚑 avoid metric bug (#12817)
* 🚑 avoid metric bug

* 🚑 avoid metric bug

* 🚑 avoid metric bug

* 🚑 avoid metric bug

* 🚑 avoid metric bug
2023-07-31 14:58:10 +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
songxiaosheng 10870708eb
🔥 remove applicationName in jvm metric (#12770)
* 🔥 remove applicationName in jvm metric

* 🔥 remove applicationName in jvm metric

* 🔥 remove applicationName in jvm metric
2023-07-31 10:25:02 +08:00