[#noissue] Refactor active agent validation to use agent ID and service type

Author: emeroad

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

@@ -101,13 +101,15 @@ private Supplier<List<String>> getAgentIdsSupplier(Application application, long
 
     private List<String> fetchActiveAgents(Application application, Range activeRange) {
         List<String> agentList = batchAgentService.getIds(application.getName());
-        return agentList
-                .stream()
-                .filter(id -> {
-                    Application agent = new Application(id, application.getServiceType());
-                    return batchAgentService.isActive(agent, activeRange);
-                })
-                .toList();
+
+        int code = application.getServiceType().getCode();
+        List<String> list = new ArrayList<>();
+        for (String agentId : agentList) {
+            if (batchAgentService.isActive(agentId, code, activeRange)) {
+                list.add(agentId);
+            }
+        }
+        return list;
     }
 
     private static class AlarmCheckerFactory {

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

@@ -17,7 +17,6 @@
 package com.navercorp.pinpoint.batch.service;
 
 import com.navercorp.pinpoint.common.timeseries.time.Range;
-import com.navercorp.pinpoint.web.vo.Application;
 
 import java.util.List;
 
@@ -30,6 +29,6 @@ public interface BatchAgentService {
 
     boolean isActive(String agentId, Range range);
 
-    boolean isActive(Application agent, Range range);
+    boolean isActive(String agentId, int agentServiceType, Range range);
 
 }

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

@@ -18,7 +18,6 @@
 
 import com.navercorp.pinpoint.common.timeseries.time.Range;
 import com.navercorp.pinpoint.web.service.component.ActiveAgentValidator;
-import com.navercorp.pinpoint.web.vo.Application;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -51,7 +50,7 @@ public boolean isActive(String agentId, Range range) {
     }
 
     @Override
-    public boolean isActive(Application agent, Range range) {
-        return this.activeAgentValidator.isActiveAgent(agent, range);
+    public boolean isActive(String agentId, int agentServiceType, Range range) {
+        return this.activeAgentValidator.isActiveAgent(agentId, agentServiceType, range);
     }
 }

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

@@ -1,14 +1,13 @@
 package com.navercorp.pinpoint.web.service.component;
 
 import com.navercorp.pinpoint.common.timeseries.time.Range;
-import com.navercorp.pinpoint.web.vo.Application;
 
 public interface ActiveAgentValidator {
     boolean isActiveAgent(String agentId, Range range);
 
-    boolean isActiveAgent(Application agent, Range range);
+    boolean isActiveAgent(String agentId, int agentServiceType, Range range);
 
-    boolean isActiveAgent(Application agent, String version, Range range);
+    boolean isActiveAgent(String agentId, int agentServiceType, String version, Range range);
 
     boolean isActiveAgentByEvent(String agentId, Range range);
 }

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

@@ -4,7 +4,6 @@
 import com.navercorp.pinpoint.common.util.CollectionUtils;
 import com.navercorp.pinpoint.web.service.AgentEventService;
 import com.navercorp.pinpoint.web.vo.AgentEvent;
-import com.navercorp.pinpoint.web.vo.Application;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -36,15 +35,15 @@ public boolean isActiveAgent(String agentId, Range range) {
     }
 
     @Override
-    public boolean isActiveAgent(Application agent, Range range) {
-        return isActiveAgent(agent, null, range);
+    public boolean isActiveAgent(String agentId, int agentServiceType, Range range) {
+        return isActiveAgent(agentId, agentServiceType, null, range);
     }
 
     @Override
-    public boolean isActiveAgent(Application agent, String version, Range range) {
-        Objects.requireNonNull(agent, "agent");
-        String agentId = agent.getName();
-        if (!agentCompatibility.isLegacyAgent(agent.getServiceTypeCode(), version)) {
+    public boolean isActiveAgent(String agentId, int agentServiceType, String version, Range range) {
+        Objects.requireNonNull(agentId, "agentId");
+
+        if (!agentCompatibility.isLegacyAgent(agentServiceType, version)) {
             logger.trace("isActiveAgentByPing");
 
             if (isActiveAgentByEvent(agentId, range)) {

web/src/test/java/com/navercorp/pinpoint/web/service/component/DefaultActiveAgentValidatorTest.java

@@ -2,10 +2,10 @@
 
 import com.navercorp.pinpoint.common.server.util.AgentEventType;
 import com.navercorp.pinpoint.common.timeseries.time.Range;
+import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.common.trace.ServiceTypeFactory;
 import com.navercorp.pinpoint.web.service.AgentEventService;
 import com.navercorp.pinpoint.web.vo.AgentEvent;
-import com.navercorp.pinpoint.web.vo.Application;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -24,15 +24,16 @@ class DefaultActiveAgentValidatorTest {
     @Mock
     AgentEventService agentEventService;
 
-    Application node = new Application("testNodeApp", ServiceTypeFactory.of(1400, "node"));
+    String agentId = "testNodeApp";
+    ServiceType node = ServiceTypeFactory.of(1400, "node");
 //    Application java = new Application("testJavaApp", ServiceTypeFactory.of(1010, "java"));
 
     @Test
     void isActiveAgent_legacy_node() {
         LegacyAgentCompatibility agentCompatibility = new DefaultLegacyAgentCompatibility();
         ActiveAgentValidator validator = new DefaultActiveAgentValidator(agentEventService, agentCompatibility);
 
-        Assertions.assertFalse(validator.isActiveAgent(node, "0.7.0", Range.between(0, 1)));
+        Assertions.assertFalse(validator.isActiveAgent(agentId, node.getCode(), "0.7.0", Range.between(0, 1)));
     }
 
     @Test
@@ -43,15 +44,15 @@ void isActiveAgent_legacy_node_with_gc() {
         AgentEvent gc = new AgentEvent("test", 1, 1, AgentEventType.AGENT_PING);
         when(agentEventService.getAgentEvents(any(), any(), any())).thenReturn(List.of(gc));
 
-        Assertions.assertTrue(validator.isActiveAgent(node, "5.0.0", Range.between(0, 1)));
+        Assertions.assertTrue(validator.isActiveAgent(agentId, node.getCode(), "5.0.0", Range.between(0, 1)));
     }
 
     @Test
     void isActiveAgent_new_node_without_ping() {
         LegacyAgentCompatibility agentCompatibility = new DefaultLegacyAgentCompatibility();
         ActiveAgentValidator validator = new DefaultActiveAgentValidator(agentEventService, agentCompatibility);
 
-        Assertions.assertFalse(validator.isActiveAgent(node, "0.8.0", Range.between(0, 1)));
+        Assertions.assertFalse(validator.isActiveAgent(agentId, node.getCode(), "0.8.0", Range.between(0, 1)));
 
         verify(agentEventService).getAgentEvents(any(), any(), any());
     }
@@ -64,6 +65,6 @@ void isActiveAgent_new_node_with_event() {
         LegacyAgentCompatibility agentCompatibility = new DefaultLegacyAgentCompatibility();
         ActiveAgentValidator validator = new DefaultActiveAgentValidator(agentEventService, agentCompatibility);
 
-        Assertions.assertTrue(validator.isActiveAgent(node, "0.8.0", Range.between(0, 1)));
+        Assertions.assertTrue(validator.isActiveAgent(agentId, node.getCode(), "0.8.0", Range.between(0, 1)));
     }
 }