[ISSUE #483] Virtual thread compatible

common/src/main/java/org/dromara/dynamictp/common/em/JreEnum.java

@@ -53,7 +53,11 @@ public enum JreEnum {
 
     JAVA_18,
 
-    JAVA_19;
+    JAVA_19,
+
+    JAVA_20,
+
+    JAVA_21;
 
     private static final JreEnum VERSION = getJre();
 

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

@@ -27,4 +27,75 @@
  **/
 @Data
 public class Metrics {
+
+    /**
+     * 正在执行任务的活跃线程大致总数
+     */
+    private int activeCount;
+
+    /**
+     * 大致任务总数
+     */
+    private long taskCount;
+
+    /**
+     * 执行超时任务数量
+     */
+    private long runTimeoutCount;
+
+    /**
+     * 是否为DtpExecutor
+     */
+    private boolean dynamic;
+
+    /**
+     * tps
+     */
+    private double tps;
+
+    /**
+     * 最大任务耗时
+     */
+    private long maxRt;
+
+    /**
+     * 最小任务耗时
+     */
+    private long minRt;
+
+    /**
+     * 任务平均耗时(单位:ms)
+     */
+    private double avg;
+
+    /**
+     * 满足50%的任务执行所需的最低耗时
+     */
+    private double tp50;
+
+    /**
+     * 满足75%的任务执行所需的最低耗时
+     */
+    private double tp75;
+
+    /**
+     * 满足90%的任务执行所需的最低耗时
+     */
+    private double tp90;
+
+    /**
+     * 满足95%的任务执行所需的最低耗时
+     */
+    private double tp95;
+
+    /**
+     * 满足99%的任务执行所需的最低耗时
+     */
+    private double tp99;
+
+    /**
+     * 满足99.9%的任务执行所需的最低耗时
+     */
+    private double tp999;
+
 }

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

@@ -81,16 +81,6 @@ public class ThreadPoolStats extends Metrics {
      */
     private int queueRemainingCapacity;
 
-    /**
-     * 正在执行任务的活跃线程大致总数
-     */
-    private int activeCount;
-
-    /**
-     * 大致任务总数
-     */
-    private long taskCount;
-
     /**
      * 已执行完成的大致任务总数
      */
@@ -121,68 +111,9 @@ public class ThreadPoolStats extends Metrics {
      */
     private String rejectHandlerName;
 
-    /**
-     * 是否DtpExecutor线程池
-     */
-    private boolean dynamic;
-
-    /**
-     * 执行超时任务数量
-     */
-    private long runTimeoutCount;
-
     /**
      * 在队列等待超时任务数量
      */
     private long queueTimeoutCount;
 
-    /**
-     * tps
-     */
-    private double tps;
-
-    /**
-     * 最大任务耗时
-     */
-    private long maxRt;
-
-    /**
-     * 最小任务耗时
-     */
-    private long minRt;
-
-    /**
-     * 任务平均耗时(单位:ms)
-     */
-    private double avg;
-
-    /**
-     * 满足50%的任务执行所需的最低耗时
-     */
-    private double tp50;
-
-    /**
-     * 满足75%的任务执行所需的最低耗时
-     */
-    private double tp75;
-
-    /**
-     * 满足90%的任务执行所需的最低耗时
-     */
-    private double tp90;
-
-    /**
-     * 满足95%的任务执行所需的最低耗时
-     */
-    private double tp95;
-
-    /**
-     * 满足99%的任务执行所需的最低耗时
-     */
-    private double tp99;
-
-    /**
-     * 满足99.9%的任务执行所需的最低耗时
-     */
-    private double tp999;
 }

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

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dromara.dynamictp.common.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * ClassName: VTExecutorStats
+ * Package: org.dromara.dynamictp.common.entity
+ * Description:
+ *
+ * @author CYC
+ * @create 2024/11/4 16:52
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class VTExecutorStats extends Metrics {
+
+    /**
+     * 虚拟线程执行器名字
+     */
+    private String executorName;
+
+    /**
+     * 虚拟线程执行器别名
+     */
+    private String executorAliasName;
+
+}

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()) {
             log.debug("DynamicTp refresh, main properties of [{}] have not changed.",
                     executorWrapper.getThreadPoolName());
             return;
@@ -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()) {
+            // update queue
+            updateQueueProps(executor, props);
+        }
 
         if (executorWrapper.isDtpExecutor()) {
             doRefreshDtp(executorWrapper, props);
@@ -242,13 +244,14 @@ private static void doRefreshCommon(ExecutorWrapper executorWrapper, DtpExecutor
         if (StringUtils.isNotBlank(props.getThreadPoolAliasName())) {
             executorWrapper.setThreadPoolAliasName(props.getThreadPoolAliasName());
         }
-
-        ExecutorAdapter<?> executor = executorWrapper.getExecutor();
-        // update reject handler
-        String currentRejectHandlerType = executor.getRejectHandlerType();
-        if (!Objects.equals(currentRejectHandlerType, props.getRejectedHandlerType())) {
-            val rejectHandler = RejectHandlerGetter.buildRejectedHandler(props.getRejectedHandlerType());
-            executorWrapper.setRejectHandler(rejectHandler);
+        if(!executorWrapper.isVirtualThreadExecutor()) {
+            ExecutorAdapter<?> executor = executorWrapper.getExecutor();
+            // update reject handler
+            String currentRejectHandlerType = executor.getRejectHandlerType();
+            if (!Objects.equals(currentRejectHandlerType, props.getRejectedHandlerType())) {
+                val rejectHandler = RejectHandlerGetter.buildRejectedHandler(props.getRejectedHandlerType());
+                executorWrapper.setRejectHandler(rejectHandler);
+            }
         }
 
         List<TaskWrapper> taskWrappers = TaskWrappers.getInstance().getByNames(props.getTaskWrapperNames());

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

@@ -20,6 +20,7 @@
 import lombok.val;
 import org.dromara.dynamictp.common.entity.ThreadPoolStats;
 import org.dromara.dynamictp.common.entity.TpMainFields;
+import org.dromara.dynamictp.common.entity.VTExecutorStats;
 import org.dromara.dynamictp.core.executor.DtpExecutor;
 import org.dromara.dynamictp.core.monitor.PerformanceProvider;
 import org.dromara.dynamictp.core.support.ExecutorAdapter;
@@ -82,6 +83,32 @@ public static ThreadPoolStats toMetrics(ExecutorWrapper wrapper) {
         return poolStats;
     }
 
+    public static VTExecutorStats toVTExecutorMetrics(ExecutorWrapper wrapper) {
+        ExecutorAdapter<?> executor = wrapper.getExecutor();
+        if (executor == null) {
+            return null;
+        }
+        ThreadPoolStatProvider provider = wrapper.getThreadPoolStatProvider();
+        PerformanceProvider performanceProvider = provider.getPerformanceProvider();
+        val performanceSnapshot = performanceProvider.getSnapshotAndReset();
+        VTExecutorStats executorStats = convertCommonVT(executor);
+        executorStats.setExecutorName(wrapper.getThreadPoolName());
+        executorStats.setExecutorAliasName(wrapper.getThreadPoolAliasName());
+        executorStats.setDynamic(executor instanceof DtpExecutor);
+
+        executorStats.setTps(performanceSnapshot.getTps());
+        executorStats.setAvg(performanceSnapshot.getAvg());
+        executorStats.setMaxRt(performanceSnapshot.getMaxRt());
+        executorStats.setMinRt(performanceSnapshot.getMinRt());
+        executorStats.setTp50(performanceSnapshot.getTp50());
+        executorStats.setTp75(performanceSnapshot.getTp75());
+        executorStats.setTp90(performanceSnapshot.getTp90());
+        executorStats.setTp95(performanceSnapshot.getTp95());
+        executorStats.setTp99(performanceSnapshot.getTp99());
+        executorStats.setTp999(performanceSnapshot.getTp999());
+        return executorStats;
+    }
+
     private static ThreadPoolStats convertCommon(ExecutorAdapter<?> executor) {
         ThreadPoolStats poolStats = new ThreadPoolStats();
         poolStats.setCorePoolSize(executor.getCorePoolSize());
@@ -100,4 +127,11 @@ private static ThreadPoolStats convertCommon(ExecutorAdapter<?> executor) {
         poolStats.setKeepAliveTime(executor.getKeepAliveTime(TimeUnit.MILLISECONDS));
         return poolStats;
     }
+
+    private static VTExecutorStats convertCommonVT(ExecutorAdapter<?> executor) {
+        VTExecutorStats executorStats = new VTExecutorStats();
+        executorStats.setActiveCount(executor.getActiveCount());
+        executorStats.setTaskCount(executor.getTaskCount());
+        return executorStats;
+    }
 }

core/src/main/java/org/dromara/dynamictp/core/executor/ExecutorType.java

@@ -21,6 +21,7 @@
 import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor;
 import lombok.Getter;
 import org.dromara.dynamictp.core.executor.priority.PriorityDtpExecutor;
+import org.dromara.dynamictp.core.support.proxy.VirtualThreadExecutorProxy;
 
 /**
  * ExecutorType related
@@ -55,7 +56,12 @@ public enum ExecutorType {
     /**
      * Priority executor type.
      */
-    PRIORITY("priority", PriorityDtpExecutor.class);
+    PRIORITY("priority", PriorityDtpExecutor.class),
+
+    /**
+     * Virtual thread executor adapter type.
+     */
+    VIRTUAL("virtual", VirtualThreadExecutorProxy.class);
 
     private final String name;
 

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

@@ -20,6 +20,7 @@
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.entity.ThreadPoolStats;
+import org.dromara.dynamictp.common.entity.VTExecutorStats;
 import org.dromara.dynamictp.common.util.ExtensionServiceLoader;
 import org.dromara.dynamictp.core.monitor.collector.InternalLogCollector;
 import org.dromara.dynamictp.core.monitor.collector.LogCollector;
@@ -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));
 
         MetricsCollector microMeterCollector = new MicroMeterCollector();
         LogCollector logCollector = new LogCollector();
@@ -68,6 +69,18 @@ public void collect(ThreadPoolStats poolStats, List<String> types) {
         }
     }
 
+    public void collectVTExecutor(VTExecutorStats vtExecutorStats, List<String> types) {
+        if (vtExecutorStats == null || CollectionUtils.isEmpty(types)) {
+            return;
+        }
+        for (String collectorType : types) {
+            MetricsCollector collector = COLLECTORS.get(collectorType.toLowerCase());
+            if (collector != null) {
+                collector.collect(vtExecutorStats);
+            }
+        }
+    }
+
     public static CollectorHandler getInstance() {
         return CollectorHandlerHolder.INSTANCE;
     }