test

Author: liustve

validator/src/main/java/com/amazon/aoc/validators/CWMetricValidator.java

@@ -92,17 +92,12 @@ public void validate() throws Exception {
         maxRetryCount,
         () -> {
 
-          // Special handling for Genesis path - just check if any metrics exist in namespace
-          // since ADOT will just capture any OTel Metrics emitted and convert them into EMF metrics, it's impossible to create 
+          // Special handling for Genesis path - just check if any metrics exists in namespace
+          // since ADOT will just capture any OTel Metrics from the emitted from the instrumentation library 
+          // and convert them into EMF metrics, it's impossible to create 
           // a validation template for this.
           if (validationConfig.getHttpPath().contains("ai-chat")) {
-
-            List<Metric> allMetricsInNamespace = cloudWatchService.listMetrics(context.getMetricNamespace(), null, null, null);
-            log.info("Found {} metrics in namespace {}", allMetricsInNamespace.size(), context.getMetricNamespace());
-            if (allMetricsInNamespace.isEmpty()) {
-              throw new BaseException(ExceptionCode.EXPECTED_METRIC_NOT_FOUND, "No metrics found in namespace: " + context.getMetricNamespace());
-            }
-            log.info("validation is passed for path {}", validationConfig.getHttpPath());
+            validateAnyMetricExists();
             return;
           }
           // We will query the Service, RemoteService, and RemoteTarget dimensions to ensure we
@@ -224,6 +219,17 @@ private void compareMetricLists(List<Metric> expectedMetricList, List<Metric> ac
                          matchAny.stream().findAny().get(), actualMetricSnapshot));
      }
   }
+  
+  private void validateAnyMetricExists() throws Exception {
+    // This will grab all metrics from last 3 hours
+    // See: https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html
+    List<Metric> allMetricsInNamespace = cloudWatchService.listMetrics(context.getMetricNamespace(), null, null, null);
+    log.info("Found {} metrics in namespace {}", allMetricsInNamespace.size(), context.getMetricNamespace());
+    if (allMetricsInNamespace.isEmpty()) {
+      throw new BaseException(ExceptionCode.EXPECTED_METRIC_NOT_FOUND, "No metrics found in namespace: " + context.getMetricNamespace());
+    }
+    log.info("validation is passed for path {}", validationConfig.getHttpPath());
+  }
 
   private List<Metric> listMetricFromCloudWatch(
       CloudWatchService cloudWatchService,