Dynamic thread pool monitoring module refactoring (#361) (#386)

opengoofy · Aug 1, 2022 · 96747a0 · 96747a0
1 parent dcf27af
commit 96747a0
Show file tree

Hide file tree

Showing 25 changed files with 561 additions and 75 deletions.
diff --git a/...le/hippo4j-core-nacos-spring-boot-starter-example/src/main/resources/bootstrap.properties b/...le/hippo4j-core-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=metric
+spring.dynamic.thread-pool.collect-type=log,prometheus
 spring.dynamic.thread-pool.check-state-interval=5
 
 spring.dynamic.thread-pool.notify-platforms[0].platform=WECHAT

diff --git a/hippo4j-monitor/hippo4j-monitor-base/pom.xml b/hippo4j-monitor/hippo4j-monitor-base/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.hippo4j</groupId>
+        <artifactId>hippo4j-monitor</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>hippo4j-monitor-base</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.txt</include>
+                    <include>**/*.json</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                            <Built-By>chen.ma</Built-By>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...tor/AbstractDynamicThreadPoolMonitor.java → ...ase/AbstractDynamicThreadPoolMonitor.java b/...tor/AbstractDynamicThreadPoolMonitor.java → ...ase/AbstractDynamicThreadPoolMonitor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package com.example.monitor.base;
 
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
@@ -26,17 +26,14 @@
 
 /**
  * Abstract dynamic thread-pool monitor.
- *
- * @author chen.ma
- * @date 2022/3/25 12:07
  */
 @RequiredArgsConstructor
 public abstract class AbstractDynamicThreadPoolMonitor implements DynamicThreadPoolMonitor {
 
     private final ThreadPoolRunStateHandler threadPoolRunStateHandler;
 
     /**
-     * Execute.
+     * Execute collection thread pool running data.
      *
      * @param poolRunStateInfo
      */

diff --git a/...ter/monitor/DynamicThreadPoolMonitor.java → ...onitor/base/DynamicThreadPoolMonitor.java b/...ter/monitor/DynamicThreadPoolMonitor.java → ...onitor/base/DynamicThreadPoolMonitor.java
@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package com.example.monitor.base;
 
 /**
  * Dynamic thread-pool monitor.
- *
- * @author chen.ma
- * @date 2022/3/25 19:03
  */
 public interface DynamicThreadPoolMonitor extends ThreadPoolMonitor {
 

diff --git a/...-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java b/...-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java
@@ -0,0 +1,26 @@
+/*
+ * 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 com.example.monitor.base;
+
+/**
+ * Monitor type enum.
+ */
+public enum MonitorTypeEnum {
+
+    LOG, PROMETHEUS, SERVER
+}
diff --git a/...ot/starter/monitor/ThreadPoolMonitor.java → ...ample/monitor/base/ThreadPoolMonitor.java b/...ot/starter/monitor/ThreadPoolMonitor.java → ...ample/monitor/base/ThreadPoolMonitor.java
@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package com.example.monitor.base;
 
 /**
  * Thread-pool monitor.
- *
- * @author chen.ma
- * @date 2022/3/25 19:03
  */
 public interface ThreadPoolMonitor {
 

diff --git a/hippo4j-monitor/hippo4j-monitor-log/pom.xml b/hippo4j-monitor/hippo4j-monitor-log/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.hippo4j</groupId>
+        <artifactId>hippo4j-monitor</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>hippo4j-monitor-log</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-monitor-base</artifactId>
+            <version>${revision}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.txt</include>
+                    <include>**/*.json</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                            <Built-By>chen.ma</Built-By>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...ot/starter/monitor/LogMonitorHandler.java → ...ippo4j/monitor/log/LogMonitorHandler.java b/...ot/starter/monitor/LogMonitorHandler.java → ...ippo4j/monitor/log/LogMonitorHandler.java
@@ -15,18 +15,16 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package cn.hippo4j.monitor.log;
 
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.common.toolkit.JSONUtil;
 import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
+import com.example.monitor.base.AbstractDynamicThreadPoolMonitor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Log monitor handler.
- *
- * @author chen.ma
- * @date 2022/3/25 19:22
+ * Log monitor handler
  */
 @Slf4j
 public class LogMonitorHandler extends AbstractDynamicThreadPoolMonitor {

diff --git a/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml b/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.hippo4j</groupId>
+        <artifactId>hippo4j-monitor</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>hippo4j-monitor-prometheus</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-monitor-base</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <version>${micrometer-core.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.txt</include>
+                    <include>**/*.json</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                            <Built-By>chen.ma</Built-By>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...starter/monitor/MetricMonitorHandler.java → .../prometheus/PrometheusMonitorHandler.java b/...starter/monitor/MetricMonitorHandler.java → .../prometheus/PrometheusMonitorHandler.java
@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.core.springboot.starter.monitor;
+package cn.hippo4j.monitor.prometheus;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
 import cn.hutool.core.bean.BeanUtil;
+import com.example.monitor.base.AbstractDynamicThreadPoolMonitor;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import io.micrometer.core.instrument.Metrics;
@@ -30,12 +31,9 @@
 import java.util.Map;
 
 /**
- * Metric monitor handler.
- *
- * @author chen.ma
- * @date 2022/3/25 20:37
+ * Prometheus monitor handler.
  */
-public class MetricMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+public class PrometheusMonitorHandler extends AbstractDynamicThreadPoolMonitor {
 
     private final static String METRIC_NAME_PREFIX = "dynamic.thread-pool";
 
@@ -45,7 +43,7 @@ public class MetricMonitorHandler extends AbstractDynamicThreadPoolMonitor {
 
     private final Map<String, ThreadPoolRunStateInfo> RUN_STATE_CACHE = Maps.newConcurrentMap();
 
-    public MetricMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
+    public PrometheusMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
         super(threadPoolRunStateHandler);
     }
 
@@ -57,13 +55,11 @@ protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
         } else {
             BeanUtil.copyProperties(poolRunStateInfo, stateInfo);
         }
-
         Environment environment = ApplicationContextHolder.getInstance().getEnvironment();
         String applicationName = environment.getProperty("spring.application.name", "application");
         Iterable<Tag> tags = Lists.newArrayList(
                 Tag.of(DYNAMIC_THREAD_POOL_ID_TAG, poolRunStateInfo.getTpId()),
                 Tag.of(APPLICATION_NAME_TAG, applicationName));
-
         // load
         Metrics.gauge(metricName("current.load"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getSimpleCurrentLoad);
         Metrics.gauge(metricName("peak.load"), tags, poolRunStateInfo, ThreadPoolRunStateInfo::getSimplePeakLoad);
@@ -88,6 +84,6 @@ private String metricName(String name) {
 
     @Override
     public String getType() {
-        return "metric";
+        return "prometheus";
     }
 }