diff --git a/docs/docs/user_docs/getting_started/config/hippo4j-config-monitor.md b/docs/docs/user_docs/getting_started/config/hippo4j-config-monitor.md index 81adfc26..f163699f 100644 --- a/docs/docs/user_docs/getting_started/config/hippo4j-config-monitor.md +++ b/docs/docs/user_docs/getting_started/config/hippo4j-config-monitor.md @@ -51,7 +51,7 @@ management: spring: dynamic: thread-pool: - collect-type: prometheus + collect-type: micrometer ``` Prometheus 配置任务，配置成功后需重启。 diff --git a/docs/docs/user_docs/getting_started/config/hippo4j-config-start.md b/docs/docs/user_docs/getting_started/config/hippo4j-config-start.md index 820f0e7c..ce768c8d 100644 --- a/docs/docs/user_docs/getting_started/config/hippo4j-config-start.md +++ b/docs/docs/user_docs/getting_started/config/hippo4j-config-start.md @@ -46,7 +46,7 @@ spring: enable: true # 是否打印 banner banner: true - # 是否开启线程池数据采集，对接 Prometheus、ES、Log 等 + # 是否开启线程池数据采集，对接 Micrometer、ES、Log 等 collect: true # 检查线程池状态，是否达到报警条件，单位毫秒 check-state-interval: 3000 diff --git a/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/apollo/ConfigApolloExampleApplication.java b/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/apollo/ConfigApolloExampleApplication.java index fb585712..61eacb93 100644 --- a/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/apollo/ConfigApolloExampleApplication.java +++ b/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/apollo/ConfigApolloExampleApplication.java @@ -22,7 +22,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableDynamicThreadPool -@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config") +@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core") public class ConfigApolloExampleApplication { public static void main(String[] args) { diff --git a/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/nacos/ConfigNacosExampleApplication.java b/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/nacos/ConfigNacosExampleApplication.java index 71cdaa6f..47044563 100644 --- a/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/nacos/ConfigNacosExampleApplication.java +++ b/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/nacos/ConfigNacosExampleApplication.java @@ -22,7 +22,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableDynamicThreadPool -@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config") +@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core") public class ConfigNacosExampleApplication { public static void main(String[] args) { diff --git a/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/resources/bootstrap.properties b/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/resources/bootstrap.properties index 0e456f90..9546f3b7 100644 --- a/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/resources/bootstrap.properties +++ b/hippo4j-example/hippo4j-config-nacos-spring-boot-starter-example/src/main/resources/bootstrap.properties @@ -18,7 +18,7 @@ spring.cloud.nacos.config.extension-configs[0].refresh=true spring.dynamic.thread-pool.enable=true spring.dynamic.thread-pool.banner=true spring.dynamic.thread-pool.collect=true -spring.dynamic.thread-pool.collect-type=prometheus +spring.dynamic.thread-pool.collect-type=micrometer spring.dynamic.thread-pool.check-state-interval=5 spring.dynamic.thread-pool.notify-platforms[0].platform=WECHAT diff --git a/hippo4j-example/hippo4j-config-zookeeper-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/zookeeper/ConfigZookeeperExampleApplication.java b/hippo4j-example/hippo4j-config-zookeeper-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/zookeeper/ConfigZookeeperExampleApplication.java index f047a8f3..5c5667fc 100644 --- a/hippo4j-example/hippo4j-config-zookeeper-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/zookeeper/ConfigZookeeperExampleApplication.java +++ b/hippo4j-example/hippo4j-config-zookeeper-spring-boot-starter-example/src/main/java/cn/hippo4j/example/config/zookeeper/ConfigZookeeperExampleApplication.java @@ -22,7 +22,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableDynamicThreadPool -@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.config") +@SpringBootApplication(scanBasePackages = "cn.hippo4j.example.core") public class ConfigZookeeperExampleApplication { public static void main(String[] args) { diff --git a/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml index b7436599..e1f1fd2e 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml @@ -38,7 +38,7 @@ cn.hippo4j - hippo4j-spring-boot-starter-monitor-prometheus + hippo4j-spring-boot-starter-monitor-micrometer ${revision} diff --git a/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/application.properties b/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/application.properties index 6647ba01..481e87f8 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/application.properties +++ b/hippo4j-example/hippo4j-spring-boot-starter-example/src/main/resources/application.properties @@ -18,5 +18,5 @@ spring.dynamic.thread-pool.item-id=dynamic-threadpool-example spring.dynamic.thread-pool.username=admin spring.dynamic.thread-pool.password=123456 -# Enable server and prometheus monitoring at the same time -spring.dynamic.thread-pool.collect-type=server,prometheus +# Enable server and micrometer monitoring at the same time +spring.dynamic.thread-pool.collect-type=server,micrometer diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/MonitorTypeEnum.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/MonitorTypeEnum.java index 4c5945db..ee6f5dc7 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/MonitorTypeEnum.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/MonitorTypeEnum.java @@ -28,9 +28,9 @@ public enum MonitorTypeEnum { LOG, /** - * PROMETHEUS + * MICROMETER */ - PROMETHEUS, + MICROMETER, /** * SERVER diff --git a/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml b/hippo4j-monitor/hippo4j-monitor-micrometer/pom.xml similarity index 97% rename from hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml rename to hippo4j-monitor/hippo4j-monitor-micrometer/pom.xml index 7ec3738c..ff6af1bc 100644 --- a/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/pom.xml @@ -7,7 +7,7 @@ hippo4j-monitor ${revision} - hippo4j-monitor-prometheus + hippo4j-monitor-micrometer diff --git a/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/MicrometerMonitorHandler.java similarity index 94% rename from hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java rename to hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/MicrometerMonitorHandler.java index 7d8e283e..a9ee5bbf 100644 --- a/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/MicrometerMonitorHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package cn.hippo4j.monitor.prometheus; +package cn.hippo4j.monitor.micrometer; import cn.hippo4j.common.config.ApplicationContextHolder; import cn.hippo4j.common.model.ThreadPoolRunStateInfo; @@ -32,9 +32,9 @@ import org.springframework.core.env.Environment; import java.util.Map; /** - * Prometheus monitor handler. + * Micrometer monitor handler. */ -public class PrometheusMonitorHandler extends AbstractDynamicThreadPoolMonitor { +public class MicrometerMonitorHandler extends AbstractDynamicThreadPoolMonitor { private final static String METRIC_NAME_PREFIX = "dynamic.thread-pool"; @@ -44,7 +44,7 @@ public class PrometheusMonitorHandler extends AbstractDynamicThreadPoolMonitor { private final Map RUN_STATE_CACHE = Maps.newConcurrentMap(); - public PrometheusMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) { + public MicrometerMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) { super(threadPoolRunStateHandler); } @@ -81,6 +81,6 @@ public class PrometheusMonitorHandler extends AbstractDynamicThreadPoolMonitor { @Override public String getType() { - return MonitorTypeEnum.PROMETHEUS.name().toLowerCase(); + return MonitorTypeEnum.MICROMETER.name().toLowerCase(); } } diff --git a/hippo4j-monitor/pom.xml b/hippo4j-monitor/pom.xml index 7921a05c..8550b18c 100644 --- a/hippo4j-monitor/pom.xml +++ b/hippo4j-monitor/pom.xml @@ -14,7 +14,7 @@ hippo4j-monitor-base hippo4j-monitor-elasticsearch hippo4j-monitor-local-log - hippo4j-monitor-prometheus + hippo4j-monitor-micrometer diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/pom.xml b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/pom.xml index 9c3ed8e7..4bc2ab72 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/pom.xml +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/pom.xml @@ -89,7 +89,7 @@ cn.hippo4j - hippo4j-spring-boot-starter-monitor-prometheus + hippo4j-spring-boot-starter-monitor-micrometer ${revision} diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/BootstrapConfigProperties.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/BootstrapConfigProperties.java index 8a534f69..46d7c0c7 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/BootstrapConfigProperties.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/BootstrapConfigProperties.java @@ -17,16 +17,15 @@ package cn.hippo4j.config.springboot.starter.config; -import java.util.List; -import java.util.Map; - -import cn.hippo4j.core.config.BootstrapPropertiesInterface; import cn.hippo4j.config.springboot.starter.parser.ConfigFileTypeEnum; +import cn.hippo4j.core.config.BootstrapPropertiesInterface; import lombok.Getter; import lombok.Setter; - import org.springframework.boot.context.properties.ConfigurationProperties; +import java.util.List; +import java.util.Map; + /** * Bootstrap core properties. */ @@ -53,7 +52,7 @@ public class BootstrapConfigProperties implements BootstrapPropertiesInterface { private Boolean collect = Boolean.TRUE; /** - * Type of collection thread pool running data. eg: log,prometheus. Multiple can be used at the same time. + * Type of collection thread pool running data. eg: log,micrometer. Multiple can be used at the same time. */ private String collectType; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/pom.xml b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/pom.xml similarity index 93% rename from hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/pom.xml rename to hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/pom.xml index de38bcf1..7391ae42 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/pom.xml +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/pom.xml @@ -7,12 +7,12 @@ hippo4j-spring-boot-starter-monitor ${revision} - hippo4j-spring-boot-starter-monitor-prometheus + hippo4j-spring-boot-starter-monitor-micrometer cn.hippo4j - hippo4j-monitor-prometheus + hippo4j-monitor-micrometer ${revision} diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/java/cn/hippo4j/springboot/starter/monitor/prometheus/PrometheusMonitorAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java similarity index 76% rename from hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/java/cn/hippo4j/springboot/starter/monitor/prometheus/PrometheusMonitorAutoConfiguration.java rename to hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java index 5aa26020..d7c991fe 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/java/cn/hippo4j/springboot/starter/monitor/prometheus/PrometheusMonitorAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/java/cn/hippo4j/springboot/starter/monitor/micrometer/MicrometerMonitorAutoConfiguration.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package cn.hippo4j.springboot.starter.monitor.prometheus; +package cn.hippo4j.springboot.starter.monitor.micrometer; import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler; -import cn.hippo4j.monitor.prometheus.PrometheusMonitorHandler; +import cn.hippo4j.monitor.micrometer.MicrometerMonitorHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * Prometheus monitor auto configuration. + * Micrometer monitor auto configuration. */ @Configuration -public class PrometheusMonitorAutoConfiguration { +public class MicrometerMonitorAutoConfiguration { @Bean - public PrometheusMonitorHandler prometheusMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) { - return new PrometheusMonitorHandler(threadPoolRunStateHandler); + public MicrometerMonitorHandler micrometerMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) { + return new MicrometerMonitorHandler(threadPoolRunStateHandler); } } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/resources/META-INF/spring.factories b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/resources/META-INF/spring.factories similarity index 56% rename from hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/resources/META-INF/spring.factories rename to hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/resources/META-INF/spring.factories index 91f26a3e..6e626350 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-prometheus/src/main/resources/META-INF/spring.factories +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.prometheus.PrometheusMonitorAutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.micrometer.MicrometerMonitorAutoConfiguration diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/pom.xml b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/pom.xml index 010c7c22..9445772d 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/pom.xml +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/pom.xml @@ -13,6 +13,6 @@ hippo4j-spring-boot-starter-monitor-elasticsearch hippo4j-spring-boot-starter-monitor-local-log - hippo4j-spring-boot-starter-monitor-prometheus + hippo4j-spring-boot-starter-monitor-micrometer diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java index 0d3771c4..e46f7732 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/BootstrapProperties.java @@ -85,7 +85,7 @@ public class BootstrapProperties implements BootstrapPropertiesInterface { private Boolean collect = true; /** - * Type of collection thread pool running data. eg: server,prometheus. Multiple can be used at the same time. + * Type of collection thread pool running data. eg: server,micrometer. Multiple can be used at the same time. */ private String collectType; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java index 62b72066..b4d5706b 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java @@ -117,7 +117,7 @@ public class ReportingEventExecutor implements Runnable, CommandLineRunner, Disp ThreadFactoryBuilder.builder().daemon(true).prefix("client.scheduled.collect.data").build()); Collection dynamicThreadPoolMonitors = DynamicThreadPoolServiceLoader.getSingletonServiceInstances(DynamicThreadPoolMonitor.class); - boolean customerDynamicThreadPoolMonitorFlag = CollectionUtil.isNotEmpty(dynamicThreadPoolMonitors) || (collectType.contains(MonitorTypeEnum.PROMETHEUS.name().toLowerCase()) + boolean customerDynamicThreadPoolMonitorFlag = CollectionUtil.isNotEmpty(dynamicThreadPoolMonitors) || (collectType.contains(MonitorTypeEnum.MICROMETER.name().toLowerCase()) || collectType.contains(MonitorTypeEnum.LOG.name().toLowerCase()) || collectType.contains(MonitorTypeEnum.ELASTICSEARCH.name().toLowerCase())); if (customerDynamicThreadPoolMonitorFlag) {