[pinpoint-apm#11267] Separate collector-monitor module

collector-monitor/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2024 NAVER Corp.
+  ~
+  ~ Licensed 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.
+  -->
+
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.navercorp.pinpoint</groupId>
+        <artifactId>pinpoint</artifactId>
+        <version>3.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>pinpoint-collector-monitor</artifactId>
+    <name>pinpoint-collector-monitor</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <jdk.version>17</jdk.version>
+        <jdk.home>${env.JAVA_17_HOME}</jdk.home>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-commons-hbase</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

collector/src/main/java/com/navercorp/pinpoint/collector/monitor/MonitoringExecutors.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/MonitoringExecutors.java

@@ -17,7 +17,7 @@
 
 package com.navercorp.pinpoint.collector.monitor;
 
-import com.navercorp.pinpoint.collector.receiver.ExecutorFactoryBean;
+import com.navercorp.pinpoint.collector.monitor.receiver.ExecutorFactoryBean;
 import com.navercorp.pinpoint.common.server.executor.ExecutorCustomizer;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
 import org.springframework.beans.factory.annotation.Qualifier;

collector/src/main/java/com/navercorp/pinpoint/collector/monitor/config/MicrometerConfiguration.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/config/MicrometerConfiguration.java

@@ -15,7 +15,7 @@
  */
 package com.navercorp.pinpoint.collector.monitor.config;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.monitor.micrometer.BulkOperationMetrics;
 import com.navercorp.pinpoint.collector.monitor.micrometer.HBaseAsyncOperationMetrics;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/BulkOperationReporter.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/dao/hbase/BulkOperationReporter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.dao.hbase;
+package com.navercorp.pinpoint.collector.monitor.dao.hbase;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;

collector/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/BulkOperationMetrics.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/BulkOperationMetrics.java

@@ -15,7 +15,7 @@
  */
 package com.navercorp.pinpoint.collector.monitor.micrometer;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.common.util.StringUtils;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

collector/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/MicrometerThreadPoolExecutorFactory.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/MicrometerThreadPoolExecutorFactory.java

@@ -17,8 +17,8 @@
 
 import com.navercorp.pinpoint.collector.monitor.LoggingRejectedExecutionHandler;
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutor;
-import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactory;
 import com.navercorp.pinpoint.collector.monitor.RejectedExecutionHandlerChain;
+import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactory;
 import com.navercorp.pinpoint.collector.monitor.BypassRunnableDecorator;
 import com.navercorp.pinpoint.collector.monitor.RunnableDecorator;
 import io.micrometer.core.instrument.Counter;

collector/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/MicrometerThreadPoolExecutorFactoryProvider.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/micrometer/MicrometerThreadPoolExecutorFactoryProvider.java

@@ -15,8 +15,8 @@
  */
 package com.navercorp.pinpoint.collector.monitor.micrometer;
 
-import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactory;
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
+import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactory;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.beans.factory.annotation.Autowired;

collector/src/main/java/com/navercorp/pinpoint/collector/receiver/ExecutorFactoryBean.java → collector-monitor/src/main/java/com/navercorp/pinpoint/collector/monitor/receiver/ExecutorFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.receiver;
+package com.navercorp.pinpoint.collector.monitor.receiver;
 
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactory;
 import jakarta.annotation.Nonnull;

collector/pom.xml

@@ -66,6 +66,10 @@
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons-hbase</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-collector-monitor</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-rpc</artifactId>
@@ -287,6 +291,7 @@
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkFactory.java

@@ -1,6 +1,6 @@
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.dao.hbase.HbaseMapResponseTimeDao;
 import com.navercorp.pinpoint.collector.dao.hbase.HbaseMapStatisticsCalleeDao;
 import com.navercorp.pinpoint.collector.dao.hbase.HbaseMapStatisticsCallerDao;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkIncrementerFactory.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.common.profiler.concurrent.PinpointThreadFactory;
 import jakarta.annotation.PreDestroy;
 import org.apache.logging.log4j.LogManager;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkOperationReporterFactory.java

@@ -17,7 +17,7 @@
 
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.BeansException;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementer.java

@@ -15,7 +15,7 @@
  */
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.common.util.Assert;
 import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix;
 import org.apache.hadoop.hbase.TableName;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkUpdater.java

@@ -15,7 +15,7 @@
  */
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.common.util.Assert;
 
 import org.apache.hadoop.hbase.TableName;

collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultBulkUpdaterTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.Flusher;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.Incrementer;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestData;

collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementerTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.collector.dao.hbase.statistics;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
+import com.navercorp.pinpoint.collector.monitor.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.Flusher;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.Incrementer;
 import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestData;

flink/pom.xml

@@ -68,6 +68,10 @@
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons-server-cluster</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-collector-monitor</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-thrift</artifactId>

pom.xml

@@ -88,6 +88,7 @@
         <module>agent-module</module>
 
         <module>collector</module>
+        <module>collector-monitor</module>
         <module>collector-starter</module>
         <module>commons</module>
         <module>commons-buffer</module>
@@ -442,6 +443,11 @@
                 <artifactId>pinpoint-batch-alarmsender</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.navercorp.pinpoint</groupId>
+                <artifactId>pinpoint-collector-monitor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.navercorp.pinpoint</groupId>
                 <artifactId>pinpoint-collector</artifactId>