Refactored thread pool monitoring (#816)

hippo4j-monitor/hippo4j-monitor-base/pom.xml

@@ -13,6 +13,17 @@
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-core</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-adapter-web</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-adapter-base</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractAdapterThreadPoolMonitor.java

@@ -0,0 +1,43 @@
+/*
+ * 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 cn.hippo4j.monitor.base;
+
+import cn.hippo4j.adapter.base.ThreadPoolAdapter;
+import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
+import cn.hippo4j.common.config.ApplicationContextHolder;
+
+import java.util.Map;
+
+/**
+ * Abstract adapter thread-pool monitor.
+ */
+public abstract class AbstractAdapterThreadPoolMonitor implements AdapterThreadPoolMonitor {
+
+    /**
+     * Execute collection thread pool running data.
+     *
+     * @param threadPoolAdapterState thread-pool adapter state
+     */
+    protected abstract void execute(ThreadPoolAdapterState threadPoolAdapterState);
+
+    @Override
+    public void collect() {
+        Map<String, ThreadPoolAdapter> threadPoolAdapterMap = ApplicationContextHolder.getBeansOfType(ThreadPoolAdapter.class);
+        threadPoolAdapterMap.forEach((beanName, bean) -> bean.getThreadPoolStates().forEach(each -> execute(each)));
+    }
+}

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java

@@ -20,24 +20,24 @@ package cn.hippo4j.monitor.base;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
 import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
-import lombok.RequiredArgsConstructor;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * Abstract dynamic thread-pool monitor.
  */
-@RequiredArgsConstructor
 public abstract class AbstractDynamicThreadPoolMonitor implements DynamicThreadPoolMonitor {
 
-    private final ThreadPoolRunStateHandler threadPoolRunStateHandler;
+    @Resource
+    private ThreadPoolRunStateHandler threadPoolRunStateHandler;
 
     /**
      * Execute collection thread pool running data.
      *
-     * @param poolRunStateInfo
+     * @param dynamicThreadPoolRunStateInfo dynamic thread-pool run state info
      */
-    protected abstract void execute(ThreadPoolRunStateInfo poolRunStateInfo);
+    protected abstract void execute(ThreadPoolRunStateInfo dynamicThreadPoolRunStateInfo);
 
     @Override
     public void collect() {

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractWebThreadPoolMonitor.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 cn.hippo4j.monitor.base;
+
+import cn.hippo4j.adapter.web.WebThreadPoolService;
+import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
+
+import javax.annotation.Resource;
+
+/**
+ * Abstract web thread-pool monitor.
+ */
+public abstract class AbstractWebThreadPoolMonitor implements WebThreadPoolMonitor {
+
+    @Resource
+    private WebThreadPoolService webThreadPoolService;
+
+    /**
+     * Execute collection thread pool running data.
+     *
+     * @param webThreadPoolRunStateInfo web thread-pool run state info
+     */
+    protected abstract void execute(ThreadPoolRunStateInfo webThreadPoolRunStateInfo);
+
+    @Override
+    public void collect() {
+        ThreadPoolRunStateInfo webThreadPoolRunStateInfo = webThreadPoolService.getWebRunStateInfo();
+        execute(webThreadPoolRunStateInfo);
+    }
+}

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AdapterThreadPoolMonitor.java

@@ -0,0 +1,25 @@
+/*
+ * 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 cn.hippo4j.monitor.base;
+
+/**
+ * Adapter thread-pool monitor.
+ */
+public interface AdapterThreadPoolMonitor extends ThreadPoolMonitor {
+
+}

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/MonitorThreadPoolTypeEnum.java

@@ -15,21 +15,25 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.springboot.starter.monitor.micrometer;
+package cn.hippo4j.monitor.base;
-
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
-import cn.hippo4j.monitor.micrometer.MicrometerMonitorHandler;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
- * Micrometer monitor configuration.
+ * Monitor thread-pool type enum.
  */
-@Configuration
+public enum MonitorThreadPoolTypeEnum {
-public class MicrometerMonitorConfiguration {
+
+    /**
+     * Dynamic thread-pool
+     */
+    DYNAMIC,
+
+    /**
+     * Web thread-pool
+     */
+    WEB,
 
-    @Bean
+    /**
-    public MicrometerMonitorHandler micrometerMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
+     * Adapter thread-pool
-        return new MicrometerMonitorHandler(threadPoolRunStateHandler);
+     */
-    }
+    ADAPTER
 }

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/ThreadPoolMonitor.java

@@ -18,19 +18,19 @@
 package cn.hippo4j.monitor.base;
 
 /**
- * Thread-pool monitor.
+ * Thread-pool runtime monitor.
  */
 public interface ThreadPoolMonitor {
 
     /**
-     * Get type.
+     * Get thread-pool monitoring type.
      *
-     * @return
+     * @return monitoring type
      */
     String getType();
 
     /**
-     * Collect data.
+     * Collect thread-pool runtime data.
      */
     void collect();
 }

hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/WebThreadPoolMonitor.java

@@ -0,0 +1,25 @@
+/*
+ * 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 cn.hippo4j.monitor.base;
+
+/**
+ * Web thread-pool monitor.
+ */
+public interface WebThreadPoolMonitor extends ThreadPoolMonitor {
+
+}

hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/AdapterThreadPoolElasticSearchMonitorHandler.java

@@ -0,0 +1,40 @@
+/*
+ * 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 cn.hippo4j.monitor.elasticsearch;
+
+import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
+import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Adapter thread-pool elastic-search monitor handler.
+ */
+@Slf4j
+public class AdapterThreadPoolElasticSearchMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+
+    @Override
+    protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
+        // TODO
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.ELASTICSEARCH.name().toLowerCase();
+    }
+}

hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/DynamicThreadPoolElasticSearchMonitorHandler.java

@@ -15,26 +15,25 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.monitor.es;
+package cn.hippo4j.monitor.elasticsearch;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.common.toolkit.BeanUtil;
 import cn.hippo4j.common.toolkit.FileUtil;
 import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
-import cn.hippo4j.monitor.es.model.EsThreadPoolRunStateInfo;
 import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
 import cn.hippo4j.monitor.base.MonitorTypeEnum;
+import cn.hippo4j.monitor.elasticsearch.model.ElasticSearchThreadPoolRunStateInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.springframework.core.env.Environment;
@@ -47,20 +46,16 @@ import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * Elastic-search monitor handler.
+ * Dynamic thread-pool elastic-search monitor handler.
  */
 @Slf4j
-public class EsMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+public class DynamicThreadPoolElasticSearchMonitorHandler extends AbstractDynamicThreadPoolMonitor {
-
-    public EsMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
-        super(threadPoolRunStateHandler);
-    }
 
     private AtomicBoolean isIndexExist = null;
 
     @Override
     protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
-        EsThreadPoolRunStateInfo esThreadPoolRunStateInfo = BeanUtil.convert(poolRunStateInfo, EsThreadPoolRunStateInfo.class);
+        ElasticSearchThreadPoolRunStateInfo esThreadPoolRunStateInfo = BeanUtil.convert(poolRunStateInfo, ElasticSearchThreadPoolRunStateInfo.class);
         Environment environment = ApplicationContextHolder.getInstance().getEnvironment();
         String indexName = environment.getProperty("es.thread-pool-state.index.name", "thread-pool-state");
         String applicationName = environment.getProperty("spring.application.name", "application");
@@ -75,8 +70,8 @@ public class EsMonitorHandler extends AbstractDynamicThreadPoolMonitor {
         this.log2Es(esThreadPoolRunStateInfo, indexName);
     }
 
-    public void log2Es(EsThreadPoolRunStateInfo esThreadPoolRunStateInfo, String indexName) {
+    public void log2Es(ElasticSearchThreadPoolRunStateInfo esThreadPoolRunStateInfo, String indexName) {
-        RestHighLevelClient client = EsClientHolder.getClient();
+        RestHighLevelClient client = ElasticSearchClientHolder.getClient();
         try {
             IndexRequest request = new IndexRequest(indexName, "_doc");
             request.id(esThreadPoolRunStateInfo.getId());
@@ -99,7 +94,7 @@ public class EsMonitorHandler extends AbstractDynamicThreadPoolMonitor {
             boolean exists = false;
             GetIndexRequest request = new GetIndexRequest(index);
             try {
-                RestHighLevelClient client = EsClientHolder.getClient();
+                RestHighLevelClient client = ElasticSearchClientHolder.getClient();
                 exists = client.indices().exists(request, RequestOptions.DEFAULT);
             } catch (IOException e) {
                 log.error("check es index fail");
@@ -110,7 +105,7 @@ public class EsMonitorHandler extends AbstractDynamicThreadPoolMonitor {
     }
 
     public void createIndex(String index, String type, String mapping, Integer shards, Integer replicas, String alias) {
-        RestHighLevelClient client = EsClientHolder.getClient();
+        RestHighLevelClient client = ElasticSearchClientHolder.getClient();
         boolean acknowledged = false;
         CreateIndexRequest request = new CreateIndexRequest(index);
         if (StringUtils.hasText(mapping)) {

hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/ElasticSearchClientHolder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.monitor.es;
+package cn.hippo4j.monitor.elasticsearch;
 
 import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.toolkit.StringUtil;
@@ -37,7 +37,7 @@ import java.util.List;
  * Elastic-search client holder.
  */
 @Slf4j
-public class EsClientHolder {
+public class ElasticSearchClientHolder {
 
     private static String host;
 

hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/WebThreadPoolElasticSearchMonitorHandler.java

@@ -0,0 +1,40 @@
+/*
+ * 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 cn.hippo4j.monitor.elasticsearch;
+
+import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
+import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Web thread-pool elastic-search monitor handler.
+ */
+@Slf4j
+public class WebThreadPoolElasticSearchMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+
+    @Override
+    protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
+        // TODO
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.ELASTICSEARCH.name().toLowerCase();
+    }
+}

hippo4j-monitor/hippo4j-monitor-elasticsearch/src/main/java/cn/hippo4j/monitor/elasticsearch/model/ElasticSearchThreadPoolRunStateInfo.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.monitor.es.model;
+package cn.hippo4j.monitor.elasticsearch.model;
 
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import lombok.Getter;
@@ -26,7 +26,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class EsThreadPoolRunStateInfo extends ThreadPoolRunStateInfo {
+public class ElasticSearchThreadPoolRunStateInfo extends ThreadPoolRunStateInfo {
 
     private String Id;
 

hippo4j-monitor/hippo4j-monitor-local-log/src/main/java/cn/hippo4j/monitor/local/log/AdapterThreadPoolLocalLogMonitorHandler.java

@@ -0,0 +1,41 @@
+/*
+ * 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 cn.hippo4j.monitor.local.log;
+
+import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
+import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.monitor.base.AbstractAdapterThreadPoolMonitor;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Adapter thread-pool local log monitor handler.
+ */
+@Slf4j
+public class AdapterThreadPoolLocalLogMonitorHandler extends AbstractAdapterThreadPoolMonitor {
+
+    @Override
+    protected void execute(ThreadPoolAdapterState threadPoolAdapterState) {
+        log.info("{}", JSONUtil.toJSONString(threadPoolAdapterState));
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.LOG.name().toLowerCase();
+    }
+}

hippo4j-monitor/hippo4j-monitor-local-log/src/main/java/cn/hippo4j/monitor/local/log/DynamicThreadPoolLocalLogMonitorHandler.java

@@ -19,20 +19,15 @@ package cn.hippo4j.monitor.local.log;
 
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
 import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
 import cn.hippo4j.monitor.base.MonitorTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Local log monitor handler.
+ * Dynamic thread-pool local log monitor handler.
  */
 @Slf4j
-public class LocalLogMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+public class DynamicThreadPoolLocalLogMonitorHandler extends AbstractDynamicThreadPoolMonitor {
-
-    public LocalLogMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
-        super(threadPoolRunStateHandler);
-    }
 
     @Override
     protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {

hippo4j-monitor/hippo4j-monitor-local-log/src/main/java/cn/hippo4j/monitor/local/log/WebThreadPoolLocalLogMonitorHandler.java

@@ -0,0 +1,41 @@
+/*
+ * 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 cn.hippo4j.monitor.local.log;
+
+import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
+import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.monitor.base.AbstractWebThreadPoolMonitor;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Web thread-pool local log monitor handler.
+ */
+@Slf4j
+public class WebThreadPoolLocalLogMonitorHandler extends AbstractWebThreadPoolMonitor {
+
+    @Override
+    protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
+        log.info("{}", JSONUtil.toJSONString(poolRunStateInfo));
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.LOG.name().toLowerCase();
+    }
+}

hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java

@@ -15,21 +15,24 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.springboot.starter.monitor.local.log;
+package cn.hippo4j.monitor.micrometer;
 
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
+import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.monitor.local.log.LocalLogMonitorHandler;
+import cn.hippo4j.monitor.base.AbstractAdapterThreadPoolMonitor;
-import org.springframework.context.annotation.Bean;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
-import org.springframework.context.annotation.Configuration;
 
 /**
- * Local log monitor configuration.
+ * Adapter thread-pool micrometer monitor handler.
  */
-@Configuration
+public class AdapterThreadPoolMicrometerMonitorHandler extends AbstractAdapterThreadPoolMonitor {
-public class LocalLogMonitorConfiguration {
 
-    @Bean
+    @Override
-    public LocalLogMonitorHandler localLogMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
+    protected void execute(ThreadPoolAdapterState threadPoolAdapterState) {
-        return new LocalLogMonitorHandler(threadPoolRunStateHandler);
+
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.MICROMETER.name().toLowerCase();
     }
 }

hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java

@@ -21,7 +21,6 @@ import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
 import cn.hippo4j.common.toolkit.BeanUtil;
 import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
 import cn.hippo4j.monitor.base.AbstractDynamicThreadPoolMonitor;
 import cn.hippo4j.monitor.base.MonitorTypeEnum;
 import io.micrometer.core.instrument.Metrics;
@@ -32,9 +31,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Micrometer monitor handler.
+ * Dynamic thread-pool micrometer monitor handler.
  */
-public class MicrometerMonitorHandler extends AbstractDynamicThreadPoolMonitor {
+public class DynamicThreadPoolMicrometerMonitorHandler extends AbstractDynamicThreadPoolMonitor {
 
     private final static String METRIC_NAME_PREFIX = "dynamic.thread-pool";
 
@@ -44,10 +43,6 @@ public class MicrometerMonitorHandler extends AbstractDynamicThreadPoolMonitor {
 
     private final Map<String, ThreadPoolRunStateInfo> RUN_STATE_CACHE = new ConcurrentHashMap<>();
 
-    public MicrometerMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
-        super(threadPoolRunStateHandler);
-    }
-
     @Override
     protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) {
         ThreadPoolRunStateInfo stateInfo = RUN_STATE_CACHE.get(poolRunStateInfo.getTpId());

hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java

@@ -15,21 +15,24 @@
  * limitations under the License.
  */
 
-package cn.hippo4j.springboot.starter.monitor.es;
+package cn.hippo4j.monitor.micrometer;
 
-import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
+import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
-import cn.hippo4j.monitor.es.EsMonitorHandler;
+import cn.hippo4j.monitor.base.AbstractWebThreadPoolMonitor;
-import org.springframework.context.annotation.Bean;
+import cn.hippo4j.monitor.base.MonitorTypeEnum;
-import org.springframework.context.annotation.Configuration;
 
 /**
- * Elastic-search monitor auto configuration.
+ * Web thread-pool micrometer monitor handler.
  */
-@Configuration
+public class WebThreadPoolMicrometerMonitorHandler extends AbstractWebThreadPoolMonitor {
-public class EsMonitorAutoConfiguration {
 
-    @Bean
+    @Override
-    public EsMonitorHandler esMonitorHandler(ThreadPoolRunStateHandler threadPoolRunStateHandler) {
+    protected void execute(ThreadPoolRunStateInfo webThreadPoolRunStateInfo) {
-        return new EsMonitorHandler(threadPoolRunStateHandler);
+
+    }
+
+    @Override
+    public String getType() {
+        return MonitorTypeEnum.MICROMETER.name().toLowerCase();
     }
 }

hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/BootstrapConfigProperties.java

@@ -46,24 +46,33 @@ public class BootstrapConfigProperties implements BootstrapPropertiesInterface {
      */
     private Boolean banner = Boolean.TRUE;
 
+    /**
+     * Thread pool monitoring related configuration.
+     */
+    private MonitorProperties monitor;
+
     /***
-     * Collect thread pool runtime indicators.
+     * Latest use {@link MonitorProperties#getEnable()}
      */
+    @Deprecated
     private Boolean collect = Boolean.TRUE;
 
     /**
-     * Type of collection thread pool running data. eg: log,micrometer. Multiple can be used at the same time.
+     * Latest use {@link MonitorProperties#getCollectTypes()}
      */
+    @Deprecated
     private String collectType;
 
     /**
-     * Delay starting data acquisition task. unit: ms
+     * Latest use {@link MonitorProperties#getInitialDelay()}
      */
+    @Deprecated
     private Long initialDelay = 10000L;
 
     /**
-     * Collect interval. unit: ms
+     * Latest use {@link MonitorProperties#getCollectInterval()}
      */
+    @Deprecated
     private Long collectInterval = 5000L;
 
     /**

hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java

@@ -37,8 +37,8 @@ import cn.hippo4j.message.service.AlarmControlHandler;
 import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
 import cn.hippo4j.message.service.Hippo4jSendMessageService;
 import cn.hippo4j.springboot.starter.adapter.web.WebAdapterConfiguration;
-import cn.hippo4j.springboot.starter.monitor.local.log.LocalLogMonitorConfiguration;
+import cn.hippo4j.springboot.starter.monitor.local.log.LocalLogMonitorAutoConfiguration;
-import cn.hippo4j.springboot.starter.monitor.micrometer.MicrometerMonitorConfiguration;
+import cn.hippo4j.springboot.starter.monitor.micrometer.MicrometerMonitorAutoConfiguration;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -60,7 +60,7 @@ import org.springframework.core.annotation.Order;
 @ConditionalOnProperty(prefix = BootstrapConfigProperties.PREFIX, value = "enable", matchIfMissing = true, havingValue = "true")
 @EnableConfigurationProperties(BootstrapConfigProperties.class)
 @Import(ConfigHandlerConfiguration.class)
-@ImportAutoConfiguration({WebAdapterConfiguration.class, UtilAutoConfiguration.class, MessageConfiguration.class, LocalLogMonitorConfiguration.class, MicrometerMonitorConfiguration.class})
+@ImportAutoConfiguration({WebAdapterConfiguration.class, UtilAutoConfiguration.class, MessageConfiguration.class})
 public class DynamicThreadPoolAutoConfiguration {
 
     private final BootstrapConfigProperties bootstrapConfigProperties;

hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/MonitorProperties.java

@@ -0,0 +1,53 @@
+/*
+ * 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 cn.hippo4j.config.springboot.starter.config;
+
+import cn.hippo4j.monitor.base.MonitorThreadPoolTypeEnum;
+import lombok.Data;
+
+/**
+ * Thread pool monitoring properties.
+ */
+@Data
+public class MonitorProperties {
+
+    /**
+     * Collect thread pool runtime indicators.
+     */
+    private Boolean enable = Boolean.TRUE;
+
+    /**
+     * Type of collection thread pool running data. eg: log,micrometer. Multiple can be used at the same time.
+     */
+    private String collectTypes;
+
+    /**
+     * Monitor the type of thread pool. eg: dynamic,web,adapter. Can be configured arbitrarily, default dynamic.
+     */
+    private String threadPoolTypes = MonitorThreadPoolTypeEnum.DYNAMIC.toString().toLowerCase();
+
+    /**
+     * Delay starting data acquisition task. unit: ms
+     */
+    private Long initialDelay = 10000L;
+
+    /**
+     * Collect interval. unit: ms
+     */
+    private Long collectInterval = 5000L;
+}

hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/java/cn/hippo4j/springboot/starter/monitor/elasticsearch/ElasticSearchMonitorAutoConfiguration.java

@@ -0,0 +1,46 @@
+/*
+ * 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 cn.hippo4j.springboot.starter.monitor.elasticsearch;
+
+import cn.hippo4j.monitor.elasticsearch.AdapterThreadPoolElasticSearchMonitorHandler;
+import cn.hippo4j.monitor.elasticsearch.DynamicThreadPoolElasticSearchMonitorHandler;
+import cn.hippo4j.monitor.elasticsearch.WebThreadPoolElasticSearchMonitorHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Elastic-search monitor auto configuration.
+ */
+@Configuration
+public class ElasticSearchMonitorAutoConfiguration {
+
+    @Bean
+    public DynamicThreadPoolElasticSearchMonitorHandler dynamicThreadPoolElasticSearchMonitorHandler() {
+        return new DynamicThreadPoolElasticSearchMonitorHandler();
+    }
+
+    @Bean
+    public WebThreadPoolElasticSearchMonitorHandler webThreadPoolElasticSearchMonitorHandler() {
+        return new WebThreadPoolElasticSearchMonitorHandler();
+    }
+
+    @Bean
+    public AdapterThreadPoolElasticSearchMonitorHandler adapterThreadPoolElasticSearchMonitorHandler() {
+        return new AdapterThreadPoolElasticSearchMonitorHandler();
+    }
+}

hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-elasticsearch/src/main/resources/META-INF/spring.factories

@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.es.EsMonitorAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.elasticsearch.ElasticSearchMonitorAutoConfiguration

hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/java/cn/hippo4j/springboot/starter/monitor/local/log/LocalLogMonitorAutoConfiguration.java

@@ -0,0 +1,46 @@
+/*
+ * 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 cn.hippo4j.springboot.starter.monitor.local.log;
+
+import cn.hippo4j.monitor.local.log.AdapterThreadPoolLocalLogMonitorHandler;
+import cn.hippo4j.monitor.local.log.DynamicThreadPoolLocalLogMonitorHandler;
+import cn.hippo4j.monitor.local.log.WebThreadPoolLocalLogMonitorHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Local log monitor auto configuration.
+ */
+@Configuration
+public class LocalLogMonitorAutoConfiguration {
+
+    @Bean
+    public DynamicThreadPoolLocalLogMonitorHandler dynamicThreadPoolLocalLogMonitorHandler() {
+        return new DynamicThreadPoolLocalLogMonitorHandler();
+    }
+
+    @Bean
+    public WebThreadPoolLocalLogMonitorHandler webThreadPoolLocalLogMonitorHandler() {
+        return new WebThreadPoolLocalLogMonitorHandler();
+    }
+
+    @Bean
+    public AdapterThreadPoolLocalLogMonitorHandler adapterThreadPoolLocalLogMonitorHandler() {
+        return new AdapterThreadPoolLocalLogMonitorHandler();
+    }
+}

hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-local-log/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.local.log.LocalLogMonitorAutoConfiguration

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

@@ -0,0 +1,46 @@
+/*
+ * 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 cn.hippo4j.springboot.starter.monitor.micrometer;
+
+import cn.hippo4j.monitor.micrometer.AdapterThreadPoolMicrometerMonitorHandler;
+import cn.hippo4j.monitor.micrometer.DynamicThreadPoolMicrometerMonitorHandler;
+import cn.hippo4j.monitor.micrometer.WebThreadPoolMicrometerMonitorHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Micrometer monitor auto configuration.
+ */
+@Configuration
+public class MicrometerMonitorAutoConfiguration {
+
+    @Bean
+    public DynamicThreadPoolMicrometerMonitorHandler dynamicThreadPoolMicrometerMonitorHandler() {
+        return new DynamicThreadPoolMicrometerMonitorHandler();
+    }
+
+    @Bean
+    public WebThreadPoolMicrometerMonitorHandler webThreadPoolMicrometerMonitorHandler() {
+        return new WebThreadPoolMicrometerMonitorHandler();
+    }
+
+    @Bean
+    public AdapterThreadPoolMicrometerMonitorHandler adapterThreadPoolMicrometerMonitorHandler() {
+        return new AdapterThreadPoolMicrometerMonitorHandler();
+    }
+}

hippo4j-spring-boot/hippo4j-spring-boot-starter-monitor/hippo4j-spring-boot-starter-monitor-micrometer/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.springboot.starter.monitor.micrometer.MicrometerMonitorAutoConfiguration

hippo4j-spring-boot/hippo4j-spring-boot-starter/pom.xml

@@ -8,41 +8,34 @@
         <version>${revision}</version>
     </parent>
     <artifactId>hippo4j-spring-boot-starter</artifactId>
-    <description>Thread pool dynamic parameter adjustment, alarming, status viewing and monitoring functions</description>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-common</artifactId>
             <version>${revision}</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
@@ -55,79 +48,41 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-adapter-base</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-spring-boot-starter-adapter-web</artifactId>
             <version>${revision}</version>
         </dependency>
-
         <dependency>
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-monitor-base</artifactId>
             <version>${revision}</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <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>