[ISSUE #483] Virtual thread compatible #506

TheFatRatre · 2024-11-13T04:53:57Z

No description provided.

…rror

…ation未获取到此bean。

# Conflicts: # adapter/adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java # core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java # core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/JMXCollector.java # example/example-nacos-cloud/src/main/resources/dynamic-tp-nacos-cloud-demo-dtp-dev.yml # extension/extension-limiter-redis/src/main/java/org/dromara/dynamictp/extension/limiter/redis/ratelimiter/NotifyRedisRateLimiterFilter.java # spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java # spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java # test/test-core/src/test/resources/postprocessor-dtp-dev.yml

yanhom1314 · 2024-11-13T06:32:50Z

example/example-nacos-cloud/pom.xml

+        <dependency>
+            <groupId>org.dromara.dynamictp</groupId>
+            <artifactId>dynamic-tp-spring</artifactId>
+            <scope>compile</scope>


为啥加这依赖呢，删掉吧

yanhom1314 · 2024-11-13T06:33:23Z

extension/extension-limiter-redis/pom.xml

+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>compile</scope>
+        </dependency>


还有这个，没用到不要引入

还有这个，没用到不要引入

这个就是因为报错说找不到相关的依赖idea让我加的，上面那个也是的

这个模块压根没用到这个依赖，为啥让引入呢，就是因为引入了这个依赖，没有指定版本，才导致级联报错

这个模块压根没用到这个依赖，为啥让引入呢，就是因为引入了这个依赖，没有指定版本，才导致级联报错

不晓得啊，就是idea让加之后就没报错了。。。

yanhom1314 · 2024-11-13T06:33:35Z

starter/starter-adapter/starter-adapter-common/pom.xml

+        <dependency>
+            <groupId>org.dromara.dynamictp</groupId>
+            <artifactId>dynamic-tp-spring</artifactId>
+            <scope>compile</scope>


KamToHung · 2024-11-13T12:59:41Z

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/VTExecutorStatsMXBean.java

@@ -0,0 +1,21 @@
+package org.dromara.dynamictp.core.monitor.collector.jmx;


新的文件需要加上License，可以使用idea插件checkstyle，导入.github中的checkstyle.xml校验下

yanhom1314 · 2024-11-17T12:25:24Z

common/src/main/java/org/dromara/dynamictp/common/entity/VTExecutorStats.java

+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class VTExecutorStats extends Metrics {


不要单独建VTExecutorStats，还是复用之前的ThreadPoolStats，可以改名为ExecutorStats，新加executorName、executorAliasName字段，同时保留poolName、poolAliasName，并设置为@deprecated，在后续版本移除掉

yanhom1314 · 2024-11-17T12:32:09Z

core/src/main/java/org/dromara/dynamictp/core/DtpRegistry.java

@@ -227,8 +227,10 @@ private static void doRefresh(ExecutorWrapper executorWrapper, DtpExecutorProps
        if (!Objects.equals(executor.allowsCoreThreadTimeOut(), props.isAllowCoreThreadTimeOut())) {
            executor.allowCoreThreadTimeOut(props.isAllowCoreThreadTimeOut());
        }
-        // update queue
-        updateQueueProps(executor, props);
+        if (!executorWrapper.isVirtualThreadExecutor()) {


不用加判断单独处理了吧，虚拟线程执行该方法也不会有副作用

yanhom1314 · 2024-11-17T12:33:33Z

core/src/main/java/org/dromara/dynamictp/core/DtpRegistry.java

-        if (!Objects.equals(currentRejectHandlerType, props.getRejectedHandlerType())) {
-            val rejectHandler = RejectHandlerGetter.buildRejectedHandler(props.getRejectedHandlerType());
-            executorWrapper.setRejectHandler(rejectHandler);
+        if (!executorWrapper.isVirtualThreadExecutor()) {


这个判断是不也可以不加？尽量少一些区别处理，能统一就统一处理

这个要是不加的话会构造一个用不到的对象，感觉这个还是保留比较好

yanhom1314 · 2024-11-17T12:35:34Z

core/src/main/java/org/dromara/dynamictp/core/converter/ExecutorConverter.java


+        if (!wrapper.isVirtualThreadExecutor()) {


同上，尽量不要四处散落判断逻辑，复用线程池逻辑，虚拟线程没有的字段保持成空值就行

yanhom1314 · 2024-11-17T12:36:50Z

core/src/main/java/org/dromara/dynamictp/core/handler/CollectorHandler.java

@@ -44,7 +45,7 @@ public final class CollectorHandler {

    private CollectorHandler() {
        List<MetricsCollector> loadedCollectors = ExtensionServiceLoader.get(MetricsCollector.class);
-        loadedCollectors.forEach(collector -> COLLECTORS.put(collector.type().toLowerCase(), collector));
+        loadedCollectors.forEach(collector -> COLLECTORS.put(collector.type(), collector));


解决冲突有问题？toLowerCase()咋删了

没印象了😂

yanhom1314 · 2024-11-17T12:40:36Z

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/VTExecutorStatsJMX.java

+ * @create 2024/11/5 18:29
+ */
+public class VTExecutorStatsJMX implements VTExecutorStatsMXBean {
+


可以删掉

yanhom1314 · 2024-11-17T12:41:37Z

core/src/main/java/org/dromara/dynamictp/core/support/ExecutorWrapper.java

@@ -177,6 +180,8 @@ public void initialize() {
            AwareManager.register(this);
        } else if (isThreadPoolExecutor()) {
            AwareManager.register(this);
+        } else if (isVirtualThreadExecutor()) {
+            AwareManager.register(this);


用 || 关系就行了

yanhom1314 · 2024-11-17T13:28:38Z

dependencies/pom.xml

@@ -15,8 +15,8 @@
        <revision>1.1.9.1-3.x</revision>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>


编译打包还是用17，保证前后兼容

yanhom1314 · 2024-11-17T13:35:20Z

spring/src/main/java/org/dromara/dynamictp/spring/annotation/DtpBeanDefinitionRegistrar.java

        BlockingQueue<Runnable> taskQueue;
        if (clazz.equals(EagerDtpExecutor.class)) {
            taskQueue = new TaskQueue(props.getQueueCapacity());
        } else if (clazz.equals(PriorityDtpExecutor.class)) {
            taskQueue = new PriorityBlockingQueue<>(props.getQueueCapacity(), PriorityDtpExecutor.getRunnableComparator());
+        } else if (clazz.equals(VirtualThreadExecutorProxy.class)) {
+            if (!VersionUtil.getVersion().equals(JDK_VERSION_21)) {
+                log.warn("DynamicTp virtual thread executor {} register warn: update your JDK version or don't use virtual thread executor!", props.getThreadPoolName());


应该是 >= 21

yanhom1314 · 2024-11-17T13:39:30Z

core/src/main/java/org/dromara/dynamictp/core/support/proxy/VirtualThreadExecutorProxy.java

+    @Override
+    public void execute(Runnable command) {
+        command = getEnhancedTask(command);
+        EnhancedRunnable.of(command, this);


包装后返回值没用？

TheFatRatre and others added 22 commits October 14, 2024 18:33

virtual thread兼容，通过VirtualThreadExecutorAdapter进行声明

f5f25f5

bean instanceof ThreadContainer && bean instanceof ExecutorService 的e…

cc83c79

…rror

使用Executors.newVirtualThreadPerTaskExecutor()进行声明

0d0c160

format

74f64c6

以注释的方式来声明executor的实现

17a913b

动态配置的实现思路

706d887

proxy的重构，这样写Bean无法注册，耦合性也高

f05dd26

移除jdk21特性使之兼容老版本

a85826c

Merge remote-tracking branch 'origin/virtual-thread' into virtual-thread

4a93554

fix

4495be0

配置中心进行配置，可以获取到executor并执行但spring没有感知到此bean，即postProcessAfterInitializ…

a729e11

…ation未获取到此bean。

解决配置中心配置VT未被登记的问题

6a1e1a9

doc

3755c8b

Merge branch 'springboot3' into virtual-thread

db44cd8

监控实现思路

0a38447

Merge remote-tracking branch 'origin/virtual-thread' into virtual-thread

f4b5804

监控模块部分实现,VTExecutorStats为期望能获取到的数据

c791fd2

监控基本实现，留了一些保留字段

ebc5e0e

complete EsCollector,format

e29ebd4

fix conflict and adapt

3dc7ee6

Merge branch 'springboot3' into virtual-thread

0b18056

yanhom1314 reviewed Nov 13, 2024

View reviewed changes

TheFatRatre added 5 commits November 13, 2024 14:49

fix and format

4154092

fix dependency

d9b5d4d

update mvn jdk

119d2e2

try fix gitgub err

7944b9b

del

33a4214

KamToHung reviewed Nov 13, 2024

View reviewed changes

format

fe40c63

core rebuild and JDK version check

f449863

yanhom1314 reviewed Nov 17, 2024

View reviewed changes

TheFatRatre and others added 4 commits November 18, 2024 12:18

重构优化

c40e854

Merge branch 'springboot3' into virtual-thread

4027731

format

2f7a99d

Merge remote-tracking branch 'origin/virtual-thread' into virtual-thread

a812aff

TheFatRatre closed this Nov 18, 2024

TheFatRatre deleted the virtual-thread branch November 18, 2024 06:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ISSUE #483] Virtual thread compatible #506

[ISSUE #483] Virtual thread compatible #506

TheFatRatre commented Nov 13, 2024

yanhom1314 Nov 13, 2024

yanhom1314 Nov 13, 2024

TheFatRatre Nov 13, 2024

yanhom1314 Nov 13, 2024

TheFatRatre Nov 13, 2024

yanhom1314 Nov 13, 2024

KamToHung Nov 13, 2024

TheFatRatre Nov 13, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

TheFatRatre Nov 18, 2024

yanhom1314 Nov 17, 2024

TheFatRatre Nov 17, 2024

yanhom1314 Nov 17, 2024

TheFatRatre Nov 17, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

yanhom1314 Nov 17, 2024

		@@ -0,0 +1,21 @@
		package org.dromara.dynamictp.core.monitor.collector.jmx;

[ISSUE #483] Virtual thread compatible #506

[ISSUE #483] Virtual thread compatible #506

Conversation

TheFatRatre commented Nov 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment