feat : 엔드포인트URL 도메인 제외

tracedin · Nov 6, 2024 · 8a5c783 · 8a5c783
1 parent 40e1ea4
commit 8a5c783
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 15 deletions.
diff --git a/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/EndPointUrl.java b/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/EndPointUrl.java
@@ -1,16 +1,29 @@
 package com.univ.tracedin.domain.project;
 
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public record EndPointUrl(String value) {
 
     private static final Pattern ENDPOINT_PATTERN =
-            Pattern.compile("^(https?://)([a-zA-Z0-9.-]+)(:[0-9]+)?(/[a-zA-Z0-9._-]+)*$");
+            Pattern.compile("^(?:https?://)?(?:[a-zA-Z0-9.-]+)(?::[0-9]+)?(/.*)");
 
     public static EndPointUrl from(String url) {
-        if (url == null || !ENDPOINT_PATTERN.matcher(url).matches()) {
+        if (url == null || !isValidUrl(url)) {
             throw new IllegalArgumentException("Invalid endpoint URL format: " + url);
         }
-        return new EndPointUrl(url);
+        return new EndPointUrl(extractEndpoint(url));
+    }
+
+    private static boolean isValidUrl(String url) {
+        return ENDPOINT_PATTERN.matcher(url).find();
+    }
+
+    private static String extractEndpoint(String url) {
+        final Matcher matcher = ENDPOINT_PATTERN.matcher(url);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        throw new IllegalArgumentException("Unable to extract endpoint from URL: " + url);
     }
 }
diff --git a/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/ProjectAnalyzer.java b/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/ProjectAnalyzer.java
@@ -1,11 +1,11 @@
 package com.univ.tracedin.domain.project;
 
-import java.util.List;
+import java.util.Set;
 
 public interface ProjectAnalyzer {
 
     ProjectStatistic<?> analyze(
             TraceSearchCondition cond, ProjectStatistic.StatisticsType statisticsType);
 
-    List<EndPointUrl> getEndpoints(ServiceSearchCondition cond);
+    Set<EndPointUrl> getEndpoints(ServiceSearchCondition cond);
 }
diff --git a/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/ProjectService.java b/tracedin-domain/src/main/java/com/univ/tracedin/domain/project/ProjectService.java
@@ -5,6 +5,7 @@
 import static com.univ.tracedin.domain.project.ProjectStatistic.*;
 
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
@@ -43,7 +44,7 @@ public List<Node> getServiceNodeList(ProjectKey projectKey) {
         return projectReader.readServiceNods(project);
     }
 
-    public List<EndPointUrl> getServiceEndpoints(ServiceSearchCondition cond) {
+    public Set<EndPointUrl> getServiceEndpoints(ServiceSearchCondition cond) {
         projectValidator.validate(cond.getProjectKey());
         return projectAnalyzer.getEndpoints(cond);
     }

diff --git a/tracedin-domain/src/main/java/com/univ/tracedin/domain/span/SpanRepository.java b/tracedin-domain/src/main/java/com/univ/tracedin/domain/span/SpanRepository.java
@@ -1,6 +1,7 @@
 package com.univ.tracedin.domain.span;
 
 import java.util.List;
+import java.util.Set;
 
 import com.univ.tracedin.common.dto.SearchCursor;
 import com.univ.tracedin.common.dto.SearchResult;
@@ -33,5 +34,5 @@ List<Span> findByProjectKeyAndSpanKind(
 
     List<HttpTps> getHttpTps(TraceSearchCondition cond);
 
-    List<EndPointUrl> getEndpoints(ServiceSearchCondition cond);
+    Set<EndPointUrl> getEndpoints(ServiceSearchCondition cond);
 }
diff --git a/tracedin-domain/src/main/java/com/univ/tracedin/domain/span/SpanStatisticsAnalyzer.java b/tracedin-domain/src/main/java/com/univ/tracedin/domain/span/SpanStatisticsAnalyzer.java
@@ -1,6 +1,6 @@
 package com.univ.tracedin.domain.span;
 
-import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 import org.springframework.stereotype.Component;
@@ -40,7 +40,7 @@ public ProjectStatistic<?> analyze(TraceSearchCondition cond, StatisticsType sta
     }
 
     @Override
-    public List<EndPointUrl> getEndpoints(ServiceSearchCondition cond) {
+    public Set<EndPointUrl> getEndpoints(ServiceSearchCondition cond) {
         return spanRepository.getEndpoints(cond);
     }
 

diff --git a/tracedin-infra/src/main/java/com/univ/tracedin/infra/span/repository/SpanCoreRepository.java b/tracedin-infra/src/main/java/com/univ/tracedin/infra/span/repository/SpanCoreRepository.java
@@ -1,6 +1,7 @@
 package com.univ.tracedin.infra.span.repository;
 
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -94,7 +95,7 @@ public List<HttpTps> getHttpTps(TraceSearchCondition cond) {
     }
 
     @Override
-    public List<EndPointUrl> getEndpoints(ServiceSearchCondition cond) {
+    public Set<EndPointUrl> getEndpoints(ServiceSearchCondition cond) {
         return spanElasticSearchRepository.getEndpointUrls(cond);
     }
 }
diff --git a/.../main/java/com/univ/tracedin/infra/span/repository/SpanElasticSearchRepositoryCustom.java b/.../main/java/com/univ/tracedin/infra/span/repository/SpanElasticSearchRepositoryCustom.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.univ.tracedin.common.dto.SearchResult;
 import com.univ.tracedin.domain.project.EndPointUrl;
@@ -32,5 +33,5 @@ SearchResult<Trace> searchTracesByNode(
 
     List<HttpTps> getHttpTps(TraceSearchCondition cond);
 
-    List<EndPointUrl> getEndpointUrls(ServiceSearchCondition cond);
+    Set<EndPointUrl> getEndpointUrls(ServiceSearchCondition cond);
 }
diff --git a/...n/java/com/univ/tracedin/infra/span/repository/SpanElasticSearchRepositoryCustomImpl.java b/...n/java/com/univ/tracedin/infra/span/repository/SpanElasticSearchRepositoryCustomImpl.java
@@ -6,6 +6,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import jakarta.json.JsonObject;
@@ -212,7 +213,7 @@ public List<HttpTps> getHttpTps(TraceSearchCondition cond) {
     }
 
     @Override
-    public List<EndPointUrl> getEndpointUrls(ServiceSearchCondition cond) {
+    public Set<EndPointUrl> getEndpointUrls(ServiceSearchCondition cond) {
         return executeESQuery(
                 () -> {
                     final SearchResponse<Void> response =
@@ -230,7 +231,7 @@ public List<EndPointUrl> getEndpointUrls(ServiceSearchCondition cond) {
                 });
     }
 
-    private static List<EndPointUrl> parseEndpointUrls(SearchResponse<Void> response) {
+    private static Set<EndPointUrl> parseEndpointUrls(SearchResponse<Void> response) {
         return response
                 .aggregations()
                 .get("nested_attributes")
@@ -242,7 +243,7 @@ private static List<EndPointUrl> parseEndpointUrls(SearchResponse<Void> response
                 .array()
                 .stream()
                 .map(bucket -> EndPointUrl.from(bucket.key().stringValue()))
-                .toList();
+                .collect(Collectors.toSet());
     }
 
     private static Aggregation endpointsAggregation() {
@@ -594,7 +595,7 @@ private static Query createSpanQuery(String projectKey, SpanType spanType, SpanK
                                                                 r.field("startEpochMillis")
                                                                         .gte(
                                                                                 JsonData.of(
-                                                                                        "now-5m"))))))
+                                                                                        "now-1m"))))))
                 ._toQuery();
     }