diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java b/austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java
index 5554720..f1e7a03 100644
--- a/austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java
+++ b/austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java
@@ -1,6 +1,9 @@
package com.java3y.austin.handler.pending;
-import com.java3y.austin.handler.config.ThreadPoolConfig;
+import com.dtp.common.em.QueueTypeEnum;
+import com.dtp.core.DtpRegistry;
+import com.dtp.core.thread.DtpExecutor;
+import com.dtp.core.thread.ThreadPoolBuilder;
import com.java3y.austin.handler.utils.GroupIdMappingUtils;
import com.java3y.austin.support.config.ThreadPoolExecutorShutdownDefinition;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +14,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
/**
@@ -22,6 +26,14 @@ public class TaskPendingHolder {
@Autowired
private ThreadPoolExecutorShutdownDefinition threadPoolExecutorShutdownDefinition;
+
+ @Autowired
+ private SpringUtils springUtils;
+
+
+ @Autowired
+ private DtpRegistry dtpRegistry;
+
/**
* 线程池的参数
*/
@@ -43,9 +55,17 @@ public class TaskPendingHolder {
@PostConstruct
public void init() {
for (String groupId : groupIds) {
- ExecutorService threadPool = ThreadPoolConfig.getThreadPool(coreSize, maxSize, queueSize);
- threadPoolExecutorShutdownDefinition.registryExecutor(threadPool);
- taskPendingHolder.put(groupId, threadPool);
+ DtpExecutor dtpExecutor = ThreadPoolBuilder.newBuilder()
+ .threadPoolName("austin-" + groupId)
+ .corePoolSize(10)
+ .maximumPoolSize(15)
+ .keepAliveTime(15000)
+ .timeUnit(TimeUnit.MILLISECONDS)
+ .workQueue(QueueTypeEnum.SYNCHRONOUS_QUEUE.getName(), null, false)
+ .buildDynamic();
+ DtpRegistry.register(dtpExecutor, "beanPostProcessor");
+ threadPoolExecutorShutdownDefinition.registryExecutor(dtpExecutor);
+ taskPendingHolder.put(groupId, dtpExecutor);
}
}
/**
diff --git a/austin-support/pom.xml b/austin-support/pom.xml
index fcdc72f..f4f672a 100644
--- a/austin-support/pom.xml
+++ b/austin-support/pom.xml
@@ -78,6 +78,11 @@
de.siegmar
logback-gelf
+
+
+ io.github.lyh200
+ dynamic-tp-spring-boot-starter-apollo
+
\ No newline at end of file
diff --git a/austin-support/src/main/java/com/java3y/austin/support/config/ThreadPoolConfiguration.java b/austin-support/src/main/java/com/java3y/austin/support/config/ThreadPoolConfiguration.java
new file mode 100644
index 0000000..9b5f76d
--- /dev/null
+++ b/austin-support/src/main/java/com/java3y/austin/support/config/ThreadPoolConfiguration.java
@@ -0,0 +1,36 @@
+package com.java3y.austin.support.config;
+
+import com.dtp.common.em.QueueTypeEnum;
+import com.dtp.core.support.ThreadPoolCreator;
+import com.dtp.core.thread.DtpExecutor;
+import com.dtp.core.thread.ThreadPoolBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Redick01
+ */
+@Configuration
+public class ThreadPoolConfiguration {
+
+ @Bean
+ public DtpExecutor dtpExecutor() {
+
+ return ThreadPoolCreator.createDynamicFast("dynamic-tp-test-1");
+ }
+
+ @Bean
+ public ThreadPoolExecutor threadPoolExecutor() {
+ return ThreadPoolBuilder.newBuilder()
+ .threadPoolName("dynamic-tp-test-2")
+ .corePoolSize(10)
+ .maximumPoolSize(15)
+ .keepAliveTime(15000)
+ .timeUnit(TimeUnit.MILLISECONDS)
+ .workQueue(QueueTypeEnum.SYNCHRONOUS_QUEUE.getName(), null, false)
+ .buildDynamic();
+ }
+}
diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java b/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java
new file mode 100644
index 0000000..beb6243
--- /dev/null
+++ b/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java
@@ -0,0 +1,22 @@
+package com.java3y.austin.web.controller;
+
+
+import com.dtp.core.DtpRegistry;
+import com.dtp.core.thread.DtpExecutor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ThreadPoolTest {
+
+
+ @GetMapping("/tp")
+ public void send() {
+ DtpExecutor dtpExecutor1 = DtpRegistry.getExecutor("austin-im.notice");
+ DtpExecutor dtpExecutor2 = DtpRegistry.getExecutor("dynamic-tp-test-2");
+
+ System.out.println(dtpExecutor1);
+ System.out.println(dtpExecutor2);
+
+ }
+}
diff --git a/austin-web/src/main/resources/dynamic-tp-apollo-dtp.yml b/austin-web/src/main/resources/dynamic-tp-apollo-dtp.yml
new file mode 100644
index 0000000..ef3a3da
--- /dev/null
+++ b/austin-web/src/main/resources/dynamic-tp-apollo-dtp.yml
@@ -0,0 +1,52 @@
+# 动态线程池配置文件，建议单独开一个文件放到配置中心，字段详解看readme介绍
+spring:
+ dynamic:
+ tp:
+ enabled: true
+ enabledBanner: true # 是否开启banner打印，默认true
+ enabledCollect: true # 是否开启监控指标采集，默认false
+ collectorType: micrometer # 监控数据采集器类型（JsonLog | MicroMeter），默认logging
+ monitorInterval: 5 # 监控时间间隔（报警判断、指标采集），默认5s
+ apollo: # apollo配置，不配置默认拿apollo配置第一个namespace
+ namespace: dynamic-tp-apollo-dtp.yml
+ configType: yml
+ platforms:
+ - platform: wechat
+ urlKey: 38aa7eff500-1287
+ receivers: apollo
+ - platform: ding
+ urlKey: f80dad441fcd65bac48473d4a88dcd6a
+ secret: SECb544445a6a34f0315d08b17de41
+ receivers: 18888888888
+ executors:
+ - threadPoolName: dynamic-tp-test-1
+ corePoolSize: 5
+ maximumPoolSize: 8
+ keepAliveTime: 40
+ queueType: VariableLinkedBlockingQueue
+ queueCapacity: 500
+ rejectedHandlerType: CallerRunsPolicy
+ threadNamePrefix: test-1
+
+ - threadPoolName: dynamic-tp-test-2
+ corePoolSize: 3
+ maximumPoolSize: 4
+ keepAliveTime: 50
+ queueType: VariableLinkedBlockingQueue
+ queueCapacity: 5000
+ threadNamePrefix: test2
+ notifyItems: # 报警项，不配置自动会配置（变更通知、容量报警、活性报警、拒绝报警）
+ - type: capacity # 报警项类型，查看源码 NotifyTypeEnum枚举类
+ enabled: true
+ threshold: 80 # 报警阈值
+ platforms: [ding,wechat] # 可选配置，不配置默认拿上层platforms配置的所以平台
+ interval: 120 # 报警间隔（单位：s）
+ - type: change
+ enabled: true
+ - type: liveness
+ enabled: true
+ threshold: 80
+ - type: reject
+ enabled: true
+ threshold: 1
+
diff --git a/pom.xml b/pom.xml
index 2c840b5..48aba5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,13 @@
${weixin-java-mp}
+
+
+ io.github.lyh200
+ dynamic-tp-spring-boot-starter-apollo
+ 1.0.1
+
+