[ISSUE #483] Virtual thread compatible #508

TheFatRatre · 2024-11-18T06:43:06Z

Virtual thread compatible

…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-20T02:17:11Z

...er/adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java

@@ -109,13 +109,13 @@ public Map<String, ExecutorWrapper> getExecutorWrappers() {
     * @return thead pools stats
     */
    @Override
-    public List<ThreadPoolStats> getMultiPoolStats() {
+    public List<ExecutorStats> getMultiPoolStats() {


改完全点，方法、变量名

yanhom1314 · 2024-11-20T02:20:43Z

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-20T02:21:30Z

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

-        poolStats.setDynamic(executor instanceof DtpExecutor);
+        ExecutorStats executorStats = convertCommon(executor);
+        executorStats.setPoolName(wrapper.getThreadPoolName());
+        executorStats.setPoolAliasName(wrapper.getThreadPoolAliasName());


新加的两个字段没赋值？

我还是用的poolname那两个打通的逻辑，想着到时一起改可能会好些。要是只改虚拟线程这边的话我怕会出现问题

我还是用的poolname那两个打通的逻辑，想着到时一起改可能会好些。要是只改虚拟线程这边的话我怕会出现问题

字段赋值不影响啊，就是监控指标多了两个字段，可用可不用

我还是用的poolname那两个打通的逻辑，想着到时一起改可能会好些。要是只改虚拟线程这边的话我怕会出现问题

字段赋值不影响啊，就是监控指标多了两个字段，可用可不用

好，那我把那两个加上去

yanhom1314 · 2024-11-20T02:21:59Z

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

-        poolStats.setTp99(performanceSnapshot.getTp99());
-        poolStats.setTp999(performanceSnapshot.getTp999());
-        return poolStats;
+        if (!wrapper.isVirtualThreadExecutor()) {


为啥加这个判断，虚拟线程也会有超时计数

yanhom1314 · 2024-11-20T02:28:28Z

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java

+
+        Iterable<Tag> tags = getTags(executorStats);
+
+        if (!executorStats.isVirtualExecutor()) {


判断不用加，不存在的用空值

yanhom1314 · 2024-11-20T02:39:42Z

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java

    public static final String APP_NAME_TAG = "app.name";

-    private static final Map<String, ThreadPoolStats> GAUGE_CACHE = new ConcurrentHashMap<>();
+    private static final Map<String, org.dromara.dynamictp.common.entity.Metrics> GAUGE_CACHE = new ConcurrentHashMap<>();


去掉包路径

它这个冲突了，有个micrometer的这个类

现在我换了一个类

yanhom1314 · 2024-11-20T02:43:09Z

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

+    @Override
+    public <T> Future<T> submit(Runnable runnable, T t) {
+        runnable = getEnhancedTask(runnable);
+        EnhancedRunnable.of(runnable, this);


返回值

这个该咋改呢，我就返回callable可以吗

yanhom1314 · 2024-11-20T02:44:05Z

pom.xml

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


用17，前后兼容

yanhom1314 · 2024-11-20T02:48:15Z

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

-        propertyValues.put(QUEUE_TIMEOUT, props.getQueueTimeout());
+
+        if (!ExecutorType.getClass(props.getExecutorType()).equals(VirtualThreadExecutorProxy.class)) {
+            propertyValues.put(ALLOW_CORE_THREAD_TIMEOUT, props.isAllowCoreThreadTimeOut());


判断不用加

这个目前虚拟线程的proxy没有这些属性，不加的话会报错

yanhom1314 · 2024-11-20T02:49:07Z

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

+            propertyValues.put(PRE_START_ALL_CORE_THREADS, props.isPreStartAllCoreThreads());
+            propertyValues.put(REJECT_HANDLER_TYPE, props.getRejectedHandlerType());
+            propertyValues.put(REJECT_ENHANCED, props.isRejectEnhanced());
+            propertyValues.put(RUN_TIMEOUT, props.getRunTimeout());


这些字段虚拟线程也会用到，超时相关是在AwareManager扩展中用到

这些字段虚拟线程也会用到，超时相关是在AwareManager扩展中用到

这些字段虚拟线程的proxy目前没有这些属性，如果暴露的话会无法生成实例。要是之后有需要的话再进行添加重构吧

KamToHung · 2024-11-21T02:28:22Z

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

+    /**
+     * 执行器名字
+     */
+    private String executorName;


JMXCollector没有用到此名字

KamToHung · 2024-11-21T02:30:39Z

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

+    private String executorName;
+
+    /**
+     * 执行器别名


这两个名字字段如果标注@deprecated的话需要兼容，不然直接改名就好?

这两个名字字段如果标注@deprecated的话需要兼容，不然直接改名就好?

行，我看看要是没有其他地方用到这两个字段我就去掉算了

KamToHung · 2024-11-21T02:40:18Z

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

@@ -196,7 +196,7 @@ private static void refresh(ExecutorWrapper executorWrapper, DtpExecutorProps pr
        TpMainFields oldFields = ExecutorConverter.toMainFields(executorWrapper);
        doRefresh(executorWrapper, props);
        TpMainFields newFields = ExecutorConverter.toMainFields(executorWrapper);
-        if (oldFields.equals(newFields)) {
+        if (oldFields.equals(newFields) && !executorWrapper.isVirtualThreadExecutor()) {


这里使用&&有问题

这里使用&&有问题

那我是直接删掉还是？

这里使用&&有问题

那我是直接删掉还是？

感觉删掉较好

KamToHung · 2024-11-21T03:11:04Z

spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java

@@ -121,6 +125,9 @@ private Object registerAndReturnCommon(Object bean, String beanName) {
            } else {
                BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
                if (!(beanDefinition instanceof AnnotatedBeanDefinition)) {
+                    if (beanDefinition.getBeanClassName().equals("org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy")) {
+                        return doRegisterAndReturnCommon(bean, beanName);


使用VirtualThreadExecutorProxy.class.getName()，后面维护也简单

KamToHung · 2024-11-21T03:13:56Z

spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java

@@ -121,6 +125,9 @@ private Object registerAndReturnCommon(Object bean, String beanName) {
            } else {
                BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
                if (!(beanDefinition instanceof AnnotatedBeanDefinition)) {
+                    if (beanDefinition.getBeanClassName().equals("org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy")) {
+                        return doRegisterAndReturnCommon(bean, beanName);


这里doRegisterAndReturnCommon调用类似原来的代码最后再调用？

这里doRegisterAndReturnCommon调用类似原来的代码最后再调用？

这个我是想着因为现在配置中心里没有需要动态配置的参数所以就直接以common的登记了。想着到时新增参数后再做重构

KamToHung · 2024-11-21T03:15:52Z

spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java

            DtpRegistry.registerExecutor(new ExecutorWrapper(poolName, proxy), REGISTER_SOURCE);
            return bean;
        }
        Executor proxy;
        if (bean instanceof ScheduledThreadPoolExecutor) {
            proxy = newScheduledTpProxy(poolName, (ScheduledThreadPoolExecutor) bean);
+        } else if (bean.getClass().getName().equals("java.util.concurrent.ThreadPerTaskExecutor")) {


这里一样使用getClass().name()，使用JreEnum做下版本限制

这里一样使用getClass().name()，使用JreEnum做下版本限制

这个地方改不了，ThreadPerTaskExecutor这个类JDK没有暴露出来，所以只能用这种方式来写。这也是虚拟线程的proxy有些不太一样的原因

KamToHung · 2024-11-21T03:24:48Z

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

+            try {
+                args = buildConstructorArgs(executorTypeClass, e);
+            } catch (UnsupportedOperationException exception) {
+                return;


这里加下异常日志

这里加下异常日志

加了，在调用的方法里面

KamToHung · 2024-11-21T03:25:25Z

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

+        } else if (clazz.equals(VirtualThreadExecutorProxy.class)) {
+            int jdkVersion = JreEnum.currentVersion().ordinal();
+            if (jdkVersion < JDK_VERSION_21_OFFSET) {
+                log.warn("DynamicTp virtual thread executor {} register warn: update your JDK version or don't use virtual thread executor!", props.getThreadPoolName());


这里日志可以去掉，抛异常带上信息，外层捕获的时候打印

那我把这个日志移到外层去吧

KamToHung · 2024-11-21T03:26:53Z

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)) {
+            int jdkVersion = JreEnum.currentVersion().ordinal();
+            if (jdkVersion < JDK_VERSION_21_OFFSET) {


版本判断加个方法到JreEnum里面，以后也会用到

KamToHung · 2024-11-21T03:32:57Z

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

+                throw new UnsupportedOperationException();
+            }
+            return new Object[]{
+                    Executors.newVirtualThreadPerTaskExecutor()


ThreadFactory factory = Thread.ofVirtual().name("xx").factory(); Executors.newThreadPerTaskExecutor(factory);

这里使用factory设置下thread name

KamToHung · 2024-11-22T06:42:30Z

spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java

@@ -125,7 +125,7 @@ private Object registerAndReturnCommon(Object bean, String beanName) {
            } else {
                BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
                if (!(beanDefinition instanceof AnnotatedBeanDefinition)) {
-                    if (beanDefinition.getBeanClassName().equals("org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy")) {
+                    if (VirtualThreadExecutorProxy.class.getName().equals("org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy")) {


这里是"org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy"换成VirtualThreadExecutorProxy.class.getName()

这里是"org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy"换成VirtualThreadExecutorProxy.class.getName()

是指反过来equal对不

[ISSUE dromara#509] JreEnum lessThan and greaterThan method

KamToHung · 2024-11-22T07:12:35Z

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)) {
+            int jreVersion = JreEnum.currentIntVersion();
+            if (jreVersion < JRE_VERSION_21) {


我在springboot3分支加了判断版本大小方法，merge过来后可以使用

我在springboot3分支加了判断版本大小方法，merge过来后可以使用

好

KamToHung · 2024-11-22T07:12:58Z

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

@@ -71,6 +75,10 @@
 @Slf4j
 public class DtpBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar, EnvironmentAware {

+    private static final Integer JRE_VERSION_21 = 21;
+
+    private static final String VIRTUAL_THREAD_EXECUTOR_TYPE = "virtual";


放在common.constant下比较好

TheFatRatre · 2024-11-22T07:46:16Z

GitHub的那个检查报错是不是该解决一下，好像是maven的编译版本低了，我去把它版本调高可以吗，或者有什么其他的解决方案

TheFatRatre · 2024-11-22T07:46:16Z

GitHub的那个检查报错是不是该解决一下，好像是maven的编译版本低了，我去把它版本调高可以吗

KamToHung · 2024-11-25T02:05:14Z

GitHub的那个检查报错是不是该解决一下，好像是maven的编译版本低了，我去把它版本调高可以吗

不是maven版本问题吧，JDK版本

TheFatRatre · 2024-11-25T02:24:49Z

GitHub的那个检查报错是不是该解决一下，好像是maven的编译版本低了，我去把它版本调高可以吗

不是maven版本问题吧，JDK版本
是的，maven的jdk编译版本吧应该。

KamToHung · 2024-11-26T10:21:03Z

spring/src/main/java/org/dromara/dynamictp/spring/DtpPostProcessor.java

@@ -121,6 +125,9 @@ private Object registerAndReturnCommon(Object bean, String beanName) {
            } else {
                BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
                if (!(beanDefinition instanceof AnnotatedBeanDefinition)) {
+                    if ("org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy".equals(VirtualThreadExecutorProxy.class.getName())) {


这里判断应该改为：beanDefinition.getBeanClassName().equals(VirtualThreadExecutorProxy.class.getName())

KamToHung · 2024-11-26T10:22:01Z

common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java

+    /**
+     *  jre
+     */
+    private static final Integer JRE_VERSION_21 = 21;


如果没用到可以删除

TheFatRatre and others added 30 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

fix and format

4154092

fix dependency

d9b5d4d

update mvn jdk

119d2e2

try fix gitgub err

7944b9b

del

33a4214

format

fe40c63

core rebuild and JDK version check

f449863

重构优化

c40e854

TheFatRatre and others added 5 commits November 18, 2024 12:31

Merge branch 'springboot3' into virtual-thread

4027731

format

2f7a99d

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

a812aff

Merge branch 'virtual-thread' into virtual-thread-spring-boot3

a96658e

fix

b4e5dcb

yanhom1314 reviewed Nov 20, 2024

View reviewed changes

TheFatRatre added 3 commits November 20, 2024 11:59

rebuild

7eaf4ca

format

15929e1

format

8457c52

KamToHung reviewed Nov 21, 2024

View reviewed changes

rebuild and fix

69ec089

KamToHung reviewed Nov 22, 2024

View reviewed changes

KamToHung added 3 commits November 22, 2024 15:01

[ISSUE dromara#509] JreEnum lessThan and greaterThan method

04df36d

[ISSUE dromara#509] JreEnum lessThan and greaterThan method

4b482fd

Merge pull request dromara#510 from KamToHung/perfect_JreEnum

8f585de

[ISSUE dromara#509] JreEnum lessThan and greaterThan method

KamToHung reviewed Nov 22, 2024

View reviewed changes

TheFatRatre and others added 2 commits November 22, 2024 15:20

Merge branch 'dromara:master' into virtual-thread

84d4d30

rebuild

21e3b41

KamToHung reviewed Nov 26, 2024

View reviewed changes

TheFatRatre added 2 commits November 26, 2024 18:34

optimize

d063f36

rebuild

36dc4c4


		Iterable<Tag> tags = getTags(executorStats);

		if (!executorStats.isVirtualExecutor()) {

[ISSUE #483] Virtual thread compatible #508

Are you sure you want to change the base?

[ISSUE #483] Virtual thread compatible #508

Conversation

TheFatRatre commented Nov 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheFatRatre Nov 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheFatRatre Nov 20, 2024 • edited Loading

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

TheFatRatre Nov 20, 2024 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KamToHung Nov 21, 2024 • edited Loading

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

TheFatRatre commented Nov 22, 2024 • edited Loading

TheFatRatre commented Nov 22, 2024

KamToHung commented Nov 25, 2024

TheFatRatre commented Nov 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheFatRatre Nov 20, 2024 •

edited

Loading

TheFatRatre Nov 20, 2024 •

edited

Loading

TheFatRatre Nov 20, 2024 •

edited

Loading

KamToHung Nov 21, 2024 •

edited

Loading

TheFatRatre commented Nov 22, 2024 •

edited

Loading