[#11997] Delete logic that stores stat data in hbase.

pinpoint-apm · Jan 23, 2025 · 6409d79 · 6409d79
1 parent d6cbe0c
commit 6409d79
Show file tree

Hide file tree

Showing 188 changed files with 218 additions and 14,339 deletions.
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java b/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java
@@ -17,27 +17,20 @@
 package com.navercorp.pinpoint.batch.alarm;
 
 import com.navercorp.pinpoint.batch.alarm.collector.AgentEventDataCollector;
-import com.navercorp.pinpoint.batch.alarm.collector.AgentStatDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.DataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.pinot.DataSourceDataCollector;
+import com.navercorp.pinpoint.batch.alarm.collector.pinot.FileDescriptorDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.pinot.HeapDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.pinot.JvmCpuDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.pinot.SystemCpuDataCollector;
-import com.navercorp.pinpoint.batch.alarm.collector.pinot.FileDescriptorDataCollector;
 import com.navercorp.pinpoint.batch.alarm.dao.AlarmDao;
-import com.navercorp.pinpoint.batch.common.BatchProperties;
-import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo;
-import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo;
-import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo;
-import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo;
 import com.navercorp.pinpoint.web.alarm.CheckerCategory;
 import com.navercorp.pinpoint.web.alarm.DataCollectorCategory;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapResponseDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapStatisticsCallerDao;
 import com.navercorp.pinpoint.web.dao.AgentEventDao;
-import com.navercorp.pinpoint.web.dao.stat.AgentStatDao;
 import com.navercorp.pinpoint.web.vo.Application;
 import org.springframework.stereotype.Component;
 
@@ -53,78 +46,28 @@ public class DataCollectorFactory {
 
     public final static long SLOT_INTERVAL_FIVE_MIN = 300000;
 
-    public final static long SLOT_INTERVAL_THREE_MIN = 180000;
-
     private final MapResponseDao mapResponseDao;
 
-    private final AgentStatDao<JvmGcBo> jvmGcDao;
-
-    private final AgentStatDao<CpuLoadBo> cpuLoadDao;
-
-    private final AgentStatDao<DataSourceListBo> dataSourceDao;
-
-    private final AgentStatDao<FileDescriptorBo> fileDescriptorDao;
-
     private final AgentEventDao agentEventDao;
 
     private final MapStatisticsCallerDao callerDao;
 
     private final AlarmDao alarmDao;
-
-    private final int collectorVersion;
-
+
     public DataCollectorFactory(MapResponseDao mapResponseDao,
-                                AgentStatDao<JvmGcBo> jvmGcDao,
-                                AgentStatDao<CpuLoadBo> cpuLoadDao,
-                                AgentStatDao<DataSourceListBo> dataSourceDao,
-                                AgentStatDao<FileDescriptorBo> fileDescriptorDao,
                                 AgentEventDao agentEventDao,
                                 MapStatisticsCallerDao callerDao,
-                                AlarmDao alarmDao,
-                                BatchProperties batchProperties) {
+                                AlarmDao alarmDao) {
         this.mapResponseDao = Objects.requireNonNull(mapResponseDao, "mapResponseDao");
-        this.jvmGcDao = Objects.requireNonNull(jvmGcDao, "jvmGcDao");
-        this.cpuLoadDao = Objects.requireNonNull(cpuLoadDao, "cpuLoadDao");
-        this.dataSourceDao = Objects.requireNonNull(dataSourceDao, "dataSourceDao");
-        this.fileDescriptorDao = Objects.requireNonNull(fileDescriptorDao, "fileDescriptorDao");
         this.agentEventDao = Objects.requireNonNull(agentEventDao, "agentEventDao");
         this.callerDao = Objects.requireNonNull(callerDao, "callerDao");
         this.alarmDao = Objects.requireNonNull(alarmDao, "alarmDao");
-        this.collectorVersion = batchProperties.getCollectorVersion();
     }
 
     public DataCollector createDataCollector(CheckerCategory checker, Application application, Supplier<List<String>> agentIds, long timeSlotEndTime) {
-        if (collectorVersion == 1) {
-            return createDataCollectorV1(checker, application, agentIds, timeSlotEndTime);
-        } else {
-            return createDataCollectorV2(checker, application, agentIds, timeSlotEndTime);
-        }
-
-    }
-
-    private DataCollector createDataCollectorV1(CheckerCategory checker, Application application, Supplier<List<String>> agentIds, long timeSlotEndTime) {
-        return switch (checker.getDataCollectorCategory()) {
-            case RESPONSE_TIME ->
-                    new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mapResponseDao, timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case AGENT_STAT, HEAP_USAGE_RATE, JVM_CPU_USAGE_RATE, SYSTEM_CPU_USAGE_RATE ->
-                    new AgentStatDataCollector(DataCollectorCategory.AGENT_STAT, jvmGcDao, cpuLoadDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case AGENT_EVENT ->
-                    new AgentEventDataCollector(DataCollectorCategory.AGENT_EVENT, agentEventDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case CALLER_STAT ->
-                    new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, callerDao, timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case DATA_SOURCE_STAT ->
-                    new com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataCollector(DataCollectorCategory.DATA_SOURCE_STAT, dataSourceDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case FILE_DESCRIPTOR ->
-                    new com.navercorp.pinpoint.batch.alarm.collector.FileDescriptorDataCollector(DataCollectorCategory.FILE_DESCRIPTOR, fileDescriptorDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-        };
-    }
-
-    private DataCollector createDataCollectorV2(CheckerCategory checker, Application application, Supplier<List<String>> agentIds, long timeSlotEndTime) {
         return switch (checker.getDataCollectorCategory()) {
             case RESPONSE_TIME ->
                     new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mapResponseDao, timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
-            case AGENT_STAT ->
-                    new AgentStatDataCollector(DataCollectorCategory.AGENT_STAT, jvmGcDao, cpuLoadDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
             case AGENT_EVENT ->
                     new AgentEventDataCollector(DataCollectorCategory.AGENT_EVENT, agentEventDao, agentIds.get(), timeSlotEndTime, SLOT_INTERVAL_FIVE_MIN);
             case CALLER_STAT ->

diff --git a/...java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateChecker.java b/...java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateChecker.java
@@ -17,9 +17,7 @@
 package com.navercorp.pinpoint.batch.alarm.checker;
 
 import com.navercorp.pinpoint.batch.alarm.collector.DataCollector;
-import com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataGetter;
-import com.navercorp.pinpoint.batch.alarm.collector.FileDescriptorDataGetter;
 import com.navercorp.pinpoint.batch.alarm.vo.DataSourceAlarmVO;
 import com.navercorp.pinpoint.common.util.Assert;
 import com.navercorp.pinpoint.web.alarm.vo.Rule;

diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountChecker.java b/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountChecker.java
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/AgentStatDataCollector.java b/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/AgentStatDataCollector.java