[pinpoint-apm#10741] Added service id

smilu97 · Mar 18, 2024 · 5c0cf21 · 5c0cf21
1 parent d961acb
commit 5c0cf21
Show file tree

Hide file tree

Showing 61 changed files with 1,421 additions and 320 deletions.
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/job/AgentRemover.java b/batch/src/main/java/com/navercorp/pinpoint/batch/job/AgentRemover.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.batch.job;
 
 import com.navercorp.pinpoint.batch.service.BatchAgentService;
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
 import jakarta.annotation.Nonnull;
 import org.apache.logging.log4j.LogManager;
@@ -45,7 +46,8 @@ public void write(@Nonnull List<? extends String> serAgentKeys) throws Exception
         for (String serKey: serAgentKeys) {
             logger.info("Removing agent: {}", serKey);
             ClusterKey key = ClusterKey.parse(serKey);
-            this.agentService.remove(UUID.fromString(key.getApplicationName()), key.getAgentId());
+            UUID applicationIdValue = UUID.fromString(key.getApplicationName());
+            this.agentService.remove(ApplicationId.of(applicationIdValue), key.getAgentId());
         }
     }
 }
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/job/ApplicationCleaningProcessor.java b/batch/src/main/java/com/navercorp/pinpoint/batch/job/ApplicationCleaningProcessor.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.batch.service.BatchAgentService;
 import com.navercorp.pinpoint.batch.service.BatchApplicationService;
 import com.navercorp.pinpoint.batch.vo.CleanTarget;
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import jakarta.annotation.Nonnull;
@@ -30,12 +31,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * @author youngjin.kim2
  */
-public class ApplicationCleaningProcessor implements ItemProcessor<UUID, List<CleanTarget>> {
+public class ApplicationCleaningProcessor implements ItemProcessor<ApplicationId, List<CleanTarget>> {
 
     private static final Logger logger = LogManager.getLogger(ApplicationCleaningProcessor.class);
 
@@ -54,7 +54,7 @@ public ApplicationCleaningProcessor(
     }
 
     @Override
-    public List<CleanTarget> process(@Nonnull UUID applicationId) throws Exception {
+    public List<CleanTarget> process(@Nonnull ApplicationId applicationId) throws Exception {
         logger.info("Processing application: {}", applicationId);
 
         Range range = getRange();
@@ -80,15 +80,15 @@ public List<CleanTarget> process(@Nonnull UUID applicationId) throws Exception {
         return targets;
     }
 
-    private boolean isApplicationTarget(UUID applicationId) {
+    private boolean isApplicationTarget(ApplicationId applicationId) {
         return !this.batchApplicationService.isActive(applicationId, this.emptyDurationThreshold);
     }
 
     private boolean isAgentTarget(String agentId, Range range) {
         return !this.agentService.isActive(agentId, range);
     }
 
-    private List<String> getAgents(UUID applicationId) {
+    private List<String> getAgents(ApplicationId applicationId) {
         return this.agentService.getIds(applicationId);
     }
 

diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/job/ApplicationRemover.java b/batch/src/main/java/com/navercorp/pinpoint/batch/job/ApplicationRemover.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.batch.job;
 
 import com.navercorp.pinpoint.batch.service.BatchApplicationService;
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.batch.item.ItemWriter;
@@ -41,7 +42,7 @@ public ApplicationRemover(BatchApplicationService applicationService) {
     @Override
     public void write(List<? extends String> applicationIds) throws Exception {
         for (String applicationIdStr : applicationIds) {
-            UUID applicationId = UUID.fromString(applicationIdStr);
+            ApplicationId applicationId = ApplicationId.of(UUID.fromString(applicationIdStr));
             logger.info("Removing application: {}", applicationId);
             this.applicationService.remove(applicationId);
             logger.info("Removed application: {}", applicationId);

diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/job/CleanupInactiveAgentsTasklet.java b/batch/src/main/java/com/navercorp/pinpoint/batch/job/CleanupInactiveAgentsTasklet.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.batch.job;
 
 import com.navercorp.pinpoint.batch.common.BatchProperties;
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.web.service.AdminService;
 import com.navercorp.pinpoint.web.service.ApplicationService;
 import com.navercorp.pinpoint.web.vo.Application;
@@ -52,7 +53,7 @@ public class CleanupInactiveAgentsTasklet implements Tasklet, StepExecutionListe
 
     private final ApplicationService applicationService;
 
-    private Queue<String> applicationNameQueue;
+    private Queue<ApplicationId> applicationIdsQueue;
     private int progress;
     private int total;
     private int inactiveCount;
@@ -70,16 +71,16 @@ public CleanupInactiveAgentsTasklet(
 
     @Override
     public void beforeStep(@Nonnull StepExecution stepExecution) {
-         List<String> applicationNames = this.applicationService.getApplications()
+         List<ApplicationId> applicationIds = this.applicationService.getApplications()
                 .stream()
-                .map(Application::name)
+                .map(Application::id)
                 .distinct()
                 .collect(Collectors.toList());
-        Collections.shuffle(applicationNames);
+        Collections.shuffle(applicationIds);
 
-        this.applicationNameQueue = new ArrayDeque<>(applicationNames);
+        this.applicationIdsQueue = new ArrayDeque<>(applicationIds);
         this.progress = 0;
-        this.total = applicationNames.size();
+        this.total = applicationIds.size();
         this.inactiveCount = 0;
     }
 
@@ -94,16 +95,16 @@ public RepeatStatus execute(
             @Nonnull StepContribution contribution,
             @Nonnull ChunkContext chunkContext
     ) throws Exception {
-        String applicationName = this.applicationNameQueue.poll();
-        if (applicationName == null) {
+        ApplicationId applicationId = this.applicationIdsQueue.poll();
+        if (applicationId == null) {
             return RepeatStatus.FINISHED;
         }
 
         try {
-            logger.info("Cleaning application {} ({}/{})", applicationName, ++progress, total);
-            inactiveCount += adminService.removeInactiveAgentInApplication(applicationName, durationDays);
+            logger.info("Cleaning application {} ({}/{})", applicationId, ++progress, total);
+            inactiveCount += adminService.removeInactiveAgentInApplication(applicationId, durationDays);
         } catch (Exception e) {
-            logger.warn("Failed to clean application {}. message: {}", applicationName, e.getMessage(), e);
+            logger.warn("Failed to clean application {}. message: {}", applicationId, e.getMessage(), e);
         }
 
         return RepeatStatus.CONTINUABLE;

diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchAgentService.java b/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchAgentService.java
@@ -16,20 +16,20 @@
 
 package com.navercorp.pinpoint.batch.service;
 
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 
 import java.util.List;
-import java.util.UUID;
 
 /**
  * @author youngjin.kim2
  */
 public interface BatchAgentService {
 
-    List<String> getIds(UUID applicationId);
+    List<String> getIds(ApplicationId applicationId);
 
     boolean isActive(String agentId, Range range);
 
-    void remove(UUID applicationId, String agentId);
+    void remove(ApplicationId applicationId, String agentId);
 
 }
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchAgentServiceImpl.java b/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchAgentServiceImpl.java
@@ -16,13 +16,13 @@
 
 package com.navercorp.pinpoint.batch.service;
 
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.web.service.AgentInfoService;
 import com.navercorp.pinpoint.web.service.ApplicationService;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * @author youngjin.kim2
@@ -41,7 +41,7 @@ public BatchAgentServiceImpl(
     }
 
     @Override
-    public List<String> getIds(UUID applicationId) {
+    public List<String> getIds(ApplicationId applicationId) {
         return this.applicationService.getAgents(applicationId);
     }
 
@@ -51,7 +51,7 @@ public boolean isActive(String agentId, Range range) {
     }
 
     @Override
-    public void remove(UUID applicationId, String agentId) {
+    public void remove(ApplicationId applicationId, String agentId) {
         this.applicationService.deleteAgent(applicationId, agentId);
     }
 }
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchApplicationService.java b/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchApplicationService.java
@@ -16,19 +16,20 @@
 
 package com.navercorp.pinpoint.batch.service;
 
+import com.navercorp.pinpoint.common.id.ApplicationId;
+
 import java.time.Duration;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * @author youngjin.kim2
  */
 public interface BatchApplicationService {
 
-    List<UUID> getAll();
+    List<ApplicationId> getAll();
 
-    boolean isActive(UUID applicationId, Duration duration);
+    boolean isActive(ApplicationId applicationId, Duration duration);
 
-    void remove(UUID applicationId);
+    void remove(ApplicationId applicationId);
 
 }
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchApplicationServiceImpl.java b/batch/src/main/java/com/navercorp/pinpoint/batch/service/BatchApplicationServiceImpl.java
@@ -16,6 +16,7 @@
 
 package com.navercorp.pinpoint.batch.service;
 
+import com.navercorp.pinpoint.common.id.ApplicationId;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.web.dao.ApplicationTraceIndexDaoV2;
 import com.navercorp.pinpoint.web.service.ApplicationService;
@@ -25,7 +26,6 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * @author youngjin.kim2
@@ -45,26 +45,26 @@ public BatchApplicationServiceImpl(
     }
 
     @Override
-    public List<UUID> getAll() {
+    public List<ApplicationId> getAll() {
         return this.applicationService.getApplications()
                 .stream()
                 .map(Application::id)
                 .toList();
     }
 
     @Override
-    public boolean isActive(UUID applicationId, Duration duration) {
+    public boolean isActive(ApplicationId applicationId, Duration duration) {
         long now = System.currentTimeMillis();
         Range range = Range.between(now - duration.toMillis(), now);
         return hasTrace(applicationId, range);
     }
 
-    private boolean hasTrace(UUID applicationId, Range range) {
+    private boolean hasTrace(ApplicationId applicationId, Range range) {
         return this.applicationTraceIndexDao.hasTraceIndex(applicationId, range,false);
     }
 
     @Override
-    public void remove(UUID applicationId) {
+    public void remove(ApplicationId applicationId) {
         this.applicationService.deleteApplication(applicationId);
     }
 

diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationInfoDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ApplicationInfoDao.java
@@ -17,18 +17,20 @@
 package com.navercorp.pinpoint.collector.dao;
 
 import com.navercorp.pinpoint.common.id.ApplicationId;
+import com.navercorp.pinpoint.common.server.bo.ApplicationInfo;
+import com.navercorp.pinpoint.common.server.bo.ApplicationSelector;
 
 /**
  * @author youngjin.kim2
  */
 public interface ApplicationInfoDao {
 
-    ApplicationId getApplicationId(String applicationName);
+    ApplicationId getApplicationId(ApplicationSelector application);
 
-    String getApplicationName(ApplicationId applicationId);
+    ApplicationInfo getApplication(ApplicationId applicationId);
 
-    ApplicationId putApplicationIdIfAbsent(String applicationName, ApplicationId applicationId);
+    ApplicationId putApplicationIdIfAbsent(ApplicationInfo application);
 
-    void ensureInverse(String applicationName, ApplicationId applicationId);
+    void ensureInverse(ApplicationInfo application);
 
 }
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ServiceInfoDao.java b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/ServiceInfoDao.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package com.navercorp.pinpoint.collector.dao;
+
+import com.navercorp.pinpoint.common.id.ApplicationId;
+import com.navercorp.pinpoint.common.id.ServiceId;
+import com.navercorp.pinpoint.common.server.bo.ServiceInfo;
+
+/**
+ * @author youngjin.kim2
+ */
+public interface ServiceInfoDao {
+
+    ServiceId getServiceId(String serviceName);
+
+    ServiceInfo getServiceInfo(ServiceId serviceId);
+
+    ServiceId putServiceIdIfAbsent(String serviceName, ServiceId serviceId);
+
+    void ensurePut(String serviceName, ServiceId serviceId);
+
+    void insertApplicationIntoService(ServiceId serviceId, ApplicationId applicationId);
+
+}