[ISSUE #504] change config prefix from 'spring.dynamic.tp' to 'dynami…

…ctp'
dromara · Nov 12, 2024 · d31872b · d31872b
1 parent 0c0fee1
commit d31872b
Show file tree

Hide file tree

Showing 47 changed files with 1,688 additions and 1,721 deletions.
diff --git a/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java b/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/AbstractDtpAdapter.java
@@ -74,7 +74,7 @@ public abstract class AbstractDtpAdapter implements DtpAdapter {
 
     protected final Map<String, ExecutorWrapper> executors = Maps.newHashMap();
 
-    public AbstractDtpAdapter() {
+    protected AbstractDtpAdapter() {
         EventBusManager.register(this);
     }
 

diff --git a/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java b/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java
@@ -18,6 +18,9 @@
 package org.dromara.dynamictp.adapter.common;
 
 import com.google.common.eventbus.Subscribe;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.apache.commons.collections4.MapUtils;
 import org.dromara.dynamictp.common.event.AlarmCheckEvent;
 import org.dromara.dynamictp.common.event.CollectEvent;
 import org.dromara.dynamictp.common.event.RefreshEvent;
@@ -26,9 +29,7 @@
 import org.dromara.dynamictp.common.properties.DtpProperties;
 import org.dromara.dynamictp.core.handler.CollectorHandler;
 import org.dromara.dynamictp.core.notifier.manager.AlarmManager;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import org.apache.commons.collections4.MapUtils;
+
 import java.util.EventObject;
 
 import static org.dromara.dynamictp.common.constant.DynamicTpConst.SCHEDULE_NOTIFY_ITEMS;
@@ -47,7 +48,7 @@ public DtpAdapterListener() {
     }
 
     @Subscribe
-    public void handleRefreshedEvent(EventObject event) {
+    public void handleDtpEvent(EventObject event) {
         try {
             if (event instanceof RefreshEvent) {
                 RefreshEvent refreshEvent = (RefreshEvent) event;

diff --git a/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java b/common/src/main/java/org/dromara/dynamictp/common/constant/DynamicTpConst.java
@@ -32,7 +32,7 @@ public final class DynamicTpConst {
 
     private DynamicTpConst() { }
 
-    public static final String MAIN_PROPERTIES_PREFIX = "spring.dynamic.tp";
+    public static final String MAIN_PROPERTIES_PREFIX = "dynamictp";
 
     public static final String DTP_ENABLED_PROP = MAIN_PROPERTIES_PREFIX + ".enabled";
 

diff --git a/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java b/common/src/main/java/org/dromara/dynamictp/common/event/DtpEvent.java
@@ -33,7 +33,7 @@ public abstract class DtpEvent extends EventObject {
 
     private final transient DtpProperties dtpProperties;
 
-    public DtpEvent(Object source, DtpProperties dtpProperties) {
+    protected DtpEvent(Object source, DtpProperties dtpProperties) {
         super(source);
         this.dtpProperties = dtpProperties;
     }

diff --git a/example/example-adapter/example-adapter-brpc/src/main/resources/application.yml b/example/example-adapter/example-adapter-brpc/src/main/resources/application.yml
@@ -7,28 +7,27 @@ spring:
   profiles:
     active: dev
 
-  dynamic:
-    tp:
-      enabled: true
-      enabledCollect: true          # 是否开启监控指标采集，默认false
-      collectorTypes: micrometer       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      monitorInterval: 5
-      platforms:                    # 通知报警平台配置
-        - platform: wechat
-          urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
-          receivers: test1,test2                   # 接受人企微名称
-        - platform: ding
-          urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
-          secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
-          receivers: 15810119805                   # 钉钉账号手机号
-        - platform: lark
-          urlKey: 0d944ae7-b24a-40                 # 替换
-          receivers: test1,test2                   # 接受人飞书名称/openid
-      brpcTp:                                      # brpc 线程池配置
-        - threadPoolName: rpc#server              # 名称规则：biz_thread_pool_name + "#" + client/server
-          corePoolSize: 100
-          maximumPoolSize: 200
-          keepAliveTime: 60
+dynamictp:
+  enabled: true
+  enabledCollect: true          # 是否开启监控指标采集，默认false
+  collectorTypes: micrometer       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+  monitorInterval: 5
+  platforms:                    # 通知报警平台配置
+    - platform: wechat
+      urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
+      receivers: test1,test2                   # 接受人企微名称
+    - platform: ding
+      urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
+      secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
+      receivers: 15810119805                   # 钉钉账号手机号
+    - platform: lark
+      urlKey: 0d944ae7-b24a-40                 # 替换
+      receivers: test1,test2                   # 接受人飞书名称/openid
+  brpcTp:                                      # brpc 线程池配置
+    - threadPoolName: rpc#server              # 名称规则：biz_thread_pool_name + "#" + client/server
+      corePoolSize: 100
+      maximumPoolSize: 200
+      keepAliveTime: 60
 
 starlight:
   server:

diff --git a/...er/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/resources/application.yml b/...er/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/resources/application.yml
@@ -7,29 +7,28 @@ spring:
   profiles:
     active: dev
 
-  dynamic:
-    tp:
-      enabled: true
-      enabledCollect: true          # 是否开启监控指标采集，默认false
-      collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      monitorInterval: 5
-      platforms:                    # 通知报警平台配置
-        - platform: wechat
-          urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
-          receivers: test1,test2                   # 接受人企微名称
-        - platform: ding
-          urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
-          secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
-          receivers: 15810119805                   # 钉钉账号手机号
-        - platform: lark
-          urlKey: 0d944ae7-b24a-40                 # 替换
-          receivers: test1,test2                   # 接受人飞书名称/openid
-      dubboTp:                                     # dubbo 线程池配置
-        - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
-          threadPoolAliasName: 测试线程池
-          corePoolSize: 100
-          maximumPoolSize: 200
-          keepAliveTime: 60
+dynamictp:
+  enabled: true
+  enabledCollect: true          # 是否开启监控指标采集，默认false
+  collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+  monitorInterval: 5
+  platforms:                    # 通知报警平台配置
+    - platform: wechat
+      urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
+      receivers: test1,test2                   # 接受人企微名称
+    - platform: ding
+      urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
+      secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
+      receivers: 15810119805                   # 钉钉账号手机号
+    - platform: lark
+      urlKey: 0d944ae7-b24a-40                 # 替换
+      receivers: test1,test2                   # 接受人飞书名称/openid
+  dubboTp:                                     # dubbo 线程池配置
+    - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
+      threadPoolAliasName: 测试线程池
+      corePoolSize: 100
+      maximumPoolSize: 200
+      keepAliveTime: 60
 
 dubbo:
   application:

diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/resources/application.yml
@@ -7,35 +7,34 @@ spring:
   profiles:
     active: dev
 
-  dynamic:
-    tp:
-      enabled: true
-      enabledCollect: true          # 是否开启监控指标采集，默认false
-      collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      monitorInterval: 5
-      platforms:                    # 通知报警平台配置
-        - platform: wechat
-          urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
-          receivers: test1,test2                   # 接受人企微名称
-        - platform: ding
-          urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
-          secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
-          receivers: 15810119805                   # 钉钉账号手机号
-        - platform: lark
-          urlKey: 0d944ae7-b24a-40                 # 替换
-          receivers: test1,test2                   # 接受人飞书名称/openid
-      dubboTp:                                     # dubbo 线程池配置
-        - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
-          threadPoolAliasName: 测试线程池
-          corePoolSize: 100
-          maximumPoolSize: 200
-          keepAliveTime: 60
-          notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
-            - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
-              enabled: true
-              threshold: 80                        # 报警阈值
-              platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
-              interval: 120                        # 报警间隔（单位：s）
+dynamictp:
+  enabled: true
+  enabledCollect: true          # 是否开启监控指标采集，默认false
+  collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+  monitorInterval: 5
+  platforms:                    # 通知报警平台配置
+    - platform: wechat
+      urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
+      receivers: test1,test2                   # 接受人企微名称
+    - platform: ding
+      urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
+      secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
+      receivers: 15810119805                   # 钉钉账号手机号
+    - platform: lark
+      urlKey: 0d944ae7-b24a-40                 # 替换
+      receivers: test1,test2                   # 接受人飞书名称/openid
+  dubboTp:                                     # dubbo 线程池配置
+    - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
+      threadPoolAliasName: 测试线程池
+      corePoolSize: 100
+      maximumPoolSize: 200
+      keepAliveTime: 60
+      notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
+        - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
+          enabled: true
+          threshold: 80                        # 报警阈值
+          platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
+          interval: 120                        # 报警间隔（单位：s）
 
 dubbo:
   application:

diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/resources/application.yml
@@ -7,35 +7,34 @@ spring:
   profiles:
     active: dev
 
-  dynamic:
-    tp:
-      enabled: true
-      enabledCollect: true          # 是否开启监控指标采集，默认false
-      collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      monitorInterval: 5
-      platforms:                    # 通知报警平台配置
-        - platform: wechat
-          urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
-          receivers: test1,test2                   # 接受人企微名称
-        - platform: ding
-          urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
-          secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
-          receivers: 15810119805                   # 钉钉账号手机号
-        - platform: lark
-          urlKey: 0d944ae7-b24a-40                 # 替换
-          receivers: test1,test2                   # 接受人飞书名称/openid
-      dubboTp:                                     # dubbo 线程池配置
-        - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
-          threadPoolAliasName: 测试线程池
-          corePoolSize: 100
-          maximumPoolSize: 200
-          keepAliveTime: 60
-          notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
-            - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
-              enabled: true
-              threshold: 80                        # 报警阈值
-              platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
-              interval: 120                        # 报警间隔（单位：s）
+dynamictp:
+  enabled: true
+  enabledCollect: true          # 是否开启监控指标采集，默认false
+  collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+  monitorInterval: 5
+  platforms:                    # 通知报警平台配置
+    - platform: wechat
+      urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
+      receivers: test1,test2                   # 接受人企微名称
+    - platform: ding
+      urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
+      secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
+      receivers: 15810119805                   # 钉钉账号手机号
+    - platform: lark
+      urlKey: 0d944ae7-b24a-40                 # 替换
+      receivers: test1,test2                   # 接受人飞书名称/openid
+  dubboTp:                                     # dubbo 线程池配置
+    - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
+      threadPoolAliasName: 测试线程池
+      corePoolSize: 100
+      maximumPoolSize: 200
+      keepAliveTime: 60
+      notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
+        - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
+          enabled: true
+          threshold: 80                        # 报警阈值
+          platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
+          interval: 120                        # 报警间隔（单位：s）
 
 dubbo:
   application:

diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/resources/application.yml
@@ -7,35 +7,34 @@ spring:
   profiles:
     active: dev
 
-  dynamic:
-    tp:
-      enabled: true
-      enabledCollect: true          # 是否开启监控指标采集，默认false
-      collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      monitorInterval: 5
-      platforms:                    # 通知报警平台配置
-        - platform: wechat
-          urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
-          receivers: test1,test2                   # 接受人企微名称
-        - platform: ding
-          urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
-          secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
-          receivers: 15810119805                   # 钉钉账号手机号
-        - platform: lark
-          urlKey: 0d944ae7-b24a-40                 # 替换
-          receivers: test1,test2                   # 接受人飞书名称/openid
-      dubboTp:                                     # dubbo 线程池配置
-        - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
-          threadPoolAliasName: 测试线程池
-          corePoolSize: 100
-          maximumPoolSize: 200
-          keepAliveTime: 60
-          notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
-            - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
-              enabled: true
-              threshold: 80                        # 报警阈值
-              platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
-              interval: 120                        # 报警间隔（单位：s）
+dynamictp:
+  enabled: true
+  enabledCollect: true          # 是否开启监控指标采集，默认false
+  collectorTypes: logging       # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+  monitorInterval: 5
+  platforms:                    # 通知报警平台配置
+    - platform: wechat
+      urlKey: 3a7500-1287-4bd-a798-c5c3d8b69c  # 替换
+      receivers: test1,test2                   # 接受人企微名称
+    - platform: ding
+      urlKey: f80dad441fcd655438f4a08dcd6a     # 替换
+      secret: SECb5441fa6f375d5b9d21           # 替换，非sign模式可以没有此值
+      receivers: 15810119805                   # 钉钉账号手机号
+    - platform: lark
+      urlKey: 0d944ae7-b24a-40                 # 替换
+      receivers: test1,test2                   # 接受人飞书名称/openid
+  dubboTp:                                     # dubbo 线程池配置
+    - threadPoolName: dubboTp#20880            # 名称规则：dubboTp + "#" + 协议端口
+      threadPoolAliasName: 测试线程池
+      corePoolSize: 100
+      maximumPoolSize: 200
+      keepAliveTime: 60
+      notifyItems:                             # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警）
+        - type: capacity                       # 报警项类型，查看源码 NotifyTypeEnum枚举类
+          enabled: true
+          threshold: 80                        # 报警阈值
+          platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
+          interval: 120                        # 报警间隔（单位：s）
 
 dubbo:
   application: