[#11337] Improve performance for Active Agent

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/AlarmProcessor.java

@@ -26,8 +26,8 @@
 import com.navercorp.pinpoint.web.alarm.DataCollectorCategory;
 import com.navercorp.pinpoint.web.alarm.vo.Rule;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
-import com.navercorp.pinpoint.web.service.AgentInfoService;
 import com.navercorp.pinpoint.web.service.AlarmService;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
 import com.navercorp.pinpoint.web.vo.Application;
 import jakarta.annotation.Nonnull;
 import org.springframework.batch.item.ItemProcessor;
@@ -53,21 +53,21 @@
 
     private final ApplicationIndexDao applicationIndexDao;
 
-    private final AgentInfoService agentInfoService;
+    private final ActiveAgentValidator activeAgentValidator;
 
     private final CheckerRegistry checkerRegistry;
 
     public AlarmProcessor(
             DataCollectorFactory dataCollectorFactory,
             AlarmService alarmService,
             ApplicationIndexDao applicationIndexDao,
-            AgentInfoService agentInfoService,
+            ActiveAgentValidator activeAgentValidator,
             CheckerRegistry checkerRegistry
     ) {
         this.dataCollectorFactory = Objects.requireNonNull(dataCollectorFactory, "dataCollectorFactory");
         this.alarmService = Objects.requireNonNull(alarmService, "alarmService");
         this.applicationIndexDao = Objects.requireNonNull(applicationIndexDao, "applicationIndexDao");
-        this.agentInfoService = Objects.requireNonNull(agentInfoService, "agentInfoService");
+        this.activeAgentValidator = Objects.requireNonNull(activeAgentValidator, "activeAgentValidator");
         this.checkerRegistry = Objects.requireNonNull(checkerRegistry, "checkerRegistry");
     }
 
@@ -102,13 +102,17 @@
 
     private Supplier<List<String>> getAgentIdsSupplier(Application application, long now) {
         Range range = Range.between(now - activeDuration, now);
-        return Suppliers.memoize(() -> fetchActiveAgents(application.getName(), range));
+        return Suppliers.memoize(() -> fetchActiveAgents(application, range));
     }
 
-    private List<String> fetchActiveAgents(String applicationId, Range activeRange) {
-        return applicationIndexDao.selectAgentIds(applicationId)
+    private List<String> fetchActiveAgents(Application application, Range activeRange) {
+        List<String> agentList = applicationIndexDao.selectAgentIds(application.getName());
+        return agentList
                 .stream()
-                .filter(id -> agentInfoService.isActiveAgent(id, activeRange))
+                .filter(id -> {
+                    Application app = new Application(id, application.getServiceType());
+                    return activeAgentValidator.isActiveAgent(app, activeRange);
+                })
                 .toList();
     }
 

batch/src/main/java/com/navercorp/pinpoint/batch/job/AgentCountProcessor.java

@@ -18,12 +18,12 @@
 import com.navercorp.pinpoint.batch.common.BatchProperties;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
-import com.navercorp.pinpoint.web.service.AgentInfoService;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
+import jakarta.annotation.Nonnull;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.batch.item.ItemProcessor;
 
-import jakarta.annotation.Nonnull;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -35,16 +35,16 @@
     private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final ApplicationIndexDao applicationIndexDao;
-    private final AgentInfoService agentInfoService;
+    private final ActiveAgentValidator activeAgentValidator;
     private final long duration;
 
     public AgentCountProcessor(
             ApplicationIndexDao applicationIndexDao,
-            AgentInfoService agentInfoService,
+            ActiveAgentValidator activeAgentValidator,
             BatchProperties batchProperties
     ) {
         this.applicationIndexDao = Objects.requireNonNull(applicationIndexDao, "applicationIndexDao");
-        this.agentInfoService = Objects.requireNonNull(agentInfoService, "agentInfoService");
+        this.activeAgentValidator = Objects.requireNonNull(activeAgentValidator, "activeAgentValidator");
 
         long durationDays = batchProperties.getCleanupInactiveAgentsDurationDays();
         this.duration = TimeUnit.DAYS.toMillis(durationDays);
@@ -63,6 +63,6 @@
     private boolean isActive(String agentId) {
         long now = System.currentTimeMillis();
         Range range = Range.between(now - duration, now);
-        return agentInfoService.isActiveAgent(agentId, range);
+        return activeAgentValidator.isActiveAgent(agentId, range);
     }
 }

batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchAgentServiceImpl.java

@@ -18,7 +18,7 @@
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
-import com.navercorp.pinpoint.web.service.AgentInfoService;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
 
 import java.util.List;
 import java.util.Objects;
@@ -29,14 +29,14 @@
 public class BatchAgentServiceImpl implements BatchAgentService {
 
     private final ApplicationIndexDao applicationIndexDao;
-    private final AgentInfoService agentInfoService;
+    private final ActiveAgentValidator activeAgentService;
 
     public BatchAgentServiceImpl(
             ApplicationIndexDao applicationIndexDao,
-            AgentInfoService agentInfoService
+            ActiveAgentValidator activeAgentService
     ) {
         this.applicationIndexDao = Objects.requireNonNull(applicationIndexDao, "applicationIndexDao");
-        this.agentInfoService = Objects.requireNonNull(agentInfoService, "agentInfoService");
+        this.activeAgentService = Objects.requireNonNull(activeAgentService, "activeAgentService");
     }
 
     @Override
@@ -46,7 +46,7 @@
 
     @Override
     public boolean isActive(String agentId, Range range) {
-        return this.agentInfoService.isActiveAgent(agentId, range);
+        return this.activeAgentService.isActiveAgent(agentId, range);
     }
 
     @Override

batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmProcessorTest.java

@@ -7,8 +7,8 @@
 import com.navercorp.pinpoint.web.alarm.CheckerCategory;
 import com.navercorp.pinpoint.web.alarm.vo.Rule;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
-import com.navercorp.pinpoint.web.service.AgentInfoService;
 import com.navercorp.pinpoint.web.service.AlarmService;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
 import com.navercorp.pinpoint.web.vo.Application;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +45,7 @@ public class AlarmProcessorTest {
     private ApplicationIndexDao applicationIndexDao;
 
     @Mock
-    private AgentInfoService agentInfoService;
+    private ActiveAgentValidator activeAgentValidator;
 
     @Mock
     private AgentStatDataCollector agentStatDataCollector;
@@ -63,7 +63,7 @@ public void shouldSkipIfNoRule() {
 
         when(alarmService.selectRuleByApplicationId(SERVICE_NAME)).thenReturn(List.of());
 
-        AlarmProcessor proc = new AlarmProcessor(dataCollectorFactory, alarmService, applicationIndexDao, agentInfoService, checkerRegistry);
+        AlarmProcessor proc = new AlarmProcessor(dataCollectorFactory, alarmService, applicationIndexDao, activeAgentValidator, checkerRegistry);
         AppAlarmChecker checker = proc.process(app);
 
         assertNull(checker, "should be skipped");
@@ -82,7 +82,7 @@ public void test() {
         when(agentStatDataCollector.getHeapUsageRate()).thenReturn(heapUsageRate);
 
         // Executions
-        AlarmProcessor processor = new AlarmProcessor(dataCollectorFactory, alarmService, applicationIndexDao, agentInfoService, checkerRegistry);
+        AlarmProcessor processor = new AlarmProcessor(dataCollectorFactory, alarmService, applicationIndexDao, activeAgentValidator, checkerRegistry);
         AppAlarmChecker appChecker = processor.process(application);
 
         // Validations

web/pom.xml

@@ -354,6 +354,11 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.semver4j</groupId>
+            <artifactId>semver4j</artifactId>
+            <version>5.3.0</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

web/src/main/java/com/navercorp/pinpoint/web/service/AdminServiceImpl.java

@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.common.util.CollectionUtils;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
 import com.navercorp.pinpoint.web.vo.Application;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -44,11 +45,11 @@ public class AdminServiceImpl implements AdminService {
 
     private final ApplicationIndexDao applicationIndexDao;
 
-    private final AgentInfoService agentInfoService;
+    private final ActiveAgentValidator activeAgentService;
 
-    public AdminServiceImpl(ApplicationIndexDao applicationIndexDao, AgentInfoService agentInfoService) {
+    public AdminServiceImpl(ApplicationIndexDao applicationIndexDao, ActiveAgentValidator activeAgentService) {
         this.applicationIndexDao = Objects.requireNonNull(applicationIndexDao, "applicationIndexDao");
-        this.agentInfoService = Objects.requireNonNull(agentInfoService, "agentInfoService");
+        this.activeAgentService = Objects.requireNonNull(activeAgentService, "activeAgentValidator");
     }
 
     @Override
@@ -184,7 +185,7 @@ private boolean isInactiveAgent(String agentId, int durationDays) {
         long now = System.currentTimeMillis();
         Range range = Range.between(now - TimeUnit.DAYS.toMillis(durationDays), now);
 
-        return !this.agentInfoService.isActiveAgent(agentId, range);
+        return !this.activeAgentService.isActiveAgent(agentId, range);
     }
 
 }

web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoService.java

@@ -73,8 +73,6 @@ public interface AgentInfoService {
 
     List<Optional<AgentStatus>> getAgentStatus(AgentStatusQuery query);
 
-    boolean isActiveAgent(String agentId, Range range);
-
     InspectorTimeline getAgentStatusTimeline(String agentId, Range range, int... excludeAgentEventTypeCodes);
 
     boolean isExistAgentId(String agentId);

web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java

@@ -17,18 +17,16 @@
 
 package com.navercorp.pinpoint.web.service;
 
-import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo;
-import com.navercorp.pinpoint.common.server.util.AgentEventType;
 import com.navercorp.pinpoint.common.server.util.time.BackwardRangeSplitter;
 import com.navercorp.pinpoint.common.server.util.time.DateTimeUtils;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.common.server.util.time.RangeSplitter;
 import com.navercorp.pinpoint.web.dao.AgentInfoDao;
 import com.navercorp.pinpoint.web.dao.AgentLifeCycleDao;
 import com.navercorp.pinpoint.web.dao.ApplicationIndexDao;
-import com.navercorp.pinpoint.web.dao.stat.AgentStatDao;
 import com.navercorp.pinpoint.web.filter.agent.AgentEventFilter;
 import com.navercorp.pinpoint.web.hyperlink.HyperLinkFactory;
+import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
 import com.navercorp.pinpoint.web.service.stat.AgentWarningStatService;
 import com.navercorp.pinpoint.web.vo.AgentEvent;
 import com.navercorp.pinpoint.web.vo.Application;
@@ -91,25 +89,23 @@
 
     private final AgentLifeCycleDao agentLifeCycleDao;
 
-    private final AgentStatDao<JvmGcBo> jvmGcDao;
     private final HyperLinkFactory hyperLinkFactory;
+    private final ActiveAgentValidator activeAgentValidator;
 
-    // legacy node agent support
-    private final List<Integer> legacyAgent = List.of(1400, 1401);
 
     public AgentInfoServiceImpl(AgentEventService agentEventService,
                                 AgentWarningStatService agentWarningStatService,
                                 ApplicationIndexDao applicationIndexDao,
                                 AgentInfoDao agentInfoDao,
                                 AgentLifeCycleDao agentLifeCycleDao,
-                                AgentStatDao<JvmGcBo> jvmGcDao,
+                                ActiveAgentValidator activeAgentValidator,
                                 HyperLinkFactory hyperLinkFactory) {
         this.agentEventService = Objects.requireNonNull(agentEventService, "agentEventService");
         this.agentWarningStatService = Objects.requireNonNull(agentWarningStatService, "agentWarningStatService");
         this.applicationIndexDao = Objects.requireNonNull(applicationIndexDao, "applicationIndexDao");
         this.agentInfoDao = Objects.requireNonNull(agentInfoDao, "agentInfoDao");
         this.agentLifeCycleDao = Objects.requireNonNull(agentLifeCycleDao, "agentLifeCycleDao");
-        this.jvmGcDao = Objects.requireNonNull(jvmGcDao, "jvmGcDao");
+        this.activeAgentValidator = Objects.requireNonNull(activeAgentValidator, "activeAgentValidator");
         this.hyperLinkFactory = Objects.requireNonNull(hyperLinkFactory, "hyperLinkFactory");
     }
 
@@ -198,32 +194,15 @@
             logger.trace("agentStatusFilter=true");
             return true;
         }
-        if (isActiveAgentByPing(agentInfo.getAgentId(), range)) {
-            logger.trace("agent ping=true");
+        Application agent = new Application(agentInfo.getAgentId(), agentInfo.getServiceType());
+        String agentVersion = agentInfo.getAgentVersion();
+        if (activeAgentValidator.isActiveAgent(agent, agentVersion, range)) {
             return true;
         }
-        if (legacyAgentSupport(agentAndStatus)) {
-            if (isActiveAgentByGcStat(agentInfo.getAgentId(), range)) {
-                logger.trace("agent gcStat=true");
-                return true;
-            }
-        }
         logger.trace("isActiveAgentPredicate=false");
         return false;
     }
 
-    private boolean legacyAgentSupport(AgentAndStatus agentAndStatus) {
-        AgentInfo agentInfo = agentAndStatus.getAgentInfo();
-        int serviceTypeCode = agentInfo.getServiceTypeCode();
-        if (!legacyAgent.contains(serviceTypeCode)) {
-            return false;
-        }
-//        String agentVersion = agentInfo.getAgentVersion();
-//        if (!legacyAgentVersion.contains(serviceTypeCode)) {
-//            return true;
-//        }
-        return true;
-    }
 
     @Override
     public ApplicationAgentHostList getApplicationAgentHostList(int offset, int limit, Period durationDays) {
@@ -303,8 +282,8 @@
 
         List<AgentInfo> result = new ArrayList<>();
         for (AgentInfo agentInfo : filteredAgentInfoList) {
-            String agentId = agentInfo.getAgentId();
-            if (isActiveAgent2(agentId, ranges)) {
+            Application agent = new Application(agentInfo.getAgentId(), agentInfo.getServiceType());
+            if (activeAgentValidator.isActiveAgent(agent, agentInfo.getAgentVersion(), ranges)) {
                 result.add(agentInfo);
             }
         }
@@ -351,13 +330,13 @@
             // FIXME This needs to be done with a more accurate information.
             // If at any time a non-java agent is introduced, or an agent that does not collect jvm data,
             // this will fail
-            boolean dataExists = isActiveAgent(agentId, fastRange);
+            boolean dataExists = activeAgentValidator.isActiveAgent(agentId, fastRange);
             if (dataExists) {
                 activeAgentIdList.add(agentId);
                 continue;
             }
 
-            dataExists = isActiveAgent(agentId, queryRange);
+            dataExists = activeAgentValidator.isActiveAgent(agentId, queryRange);
             if (dataExists) {
                 activeAgentIdList.add(agentId);
             }
@@ -509,37 +488,6 @@
         return this.agentLifeCycleDao.getAgentStatus(query);
     }
 
-    @Override
-    public boolean isActiveAgent(String agentId, Range range) {
-        Objects.requireNonNull(agentId, "agentId");
-        return isActiveAgentByGcStat(agentId, range) ||
-                isActiveAgentByPing(agentId, range);
-    }
-
-    public boolean isActiveAgent2(String agentId, Range range) {
-        Objects.requireNonNull(agentId, "agentId");
-        return isActiveAgentByPing(agentId, range) ||
-                isActiveAgentByGcStat(agentId, range);
-    }
-
-    private boolean isActiveAgent2(String agentId, List<Range> ranges) {
-        for (Range range : ranges) {
-            if (isActiveAgent2(agentId, range)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean isActiveAgentByGcStat(String agentId, Range range) {
-        return this.jvmGcDao.agentStatExists(agentId, range);
-    }
-
-    private boolean isActiveAgentByPing(String agentId, Range range) {
-        return this.agentEventService.getAgentEvents(agentId, range)
-                .stream()
-                .anyMatch(e -> e.getEventTypeCode() == AgentEventType.AGENT_PING.getCode());
-    }
 
     @Override
     public InspectorTimeline getAgentStatusTimeline(String agentId, Range range, int... excludeAgentEventTypeCodes) {

web/src/main/java/com/navercorp/pinpoint/web/service/component/ActiveAgentValidator.java

@@ -0,0 +1,18 @@
+package com.navercorp.pinpoint.web.service.component;
+
+import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.web.vo.Application;
+
+import java.util.List;
+
+public interface ActiveAgentValidator {
+    boolean isActiveAgent(String agentId, Range range);
+
+    boolean isActiveAgent(Application agent, Range range);
+
+    boolean isActiveAgent(Application agent, String version, Range range);
+
+    boolean isActiveAgent(Application agent, String version, List<Range> ranges);
+
+    boolean isActiveAgentByPing(String agentId, Range range);
+}