Trying validation post updating the CWLogValidator file

Author: Jeel Mehta

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

@@ -65,32 +65,36 @@ public void validate() throws Exception {
           // which are in normal text as they are needed for
           // the filter expressions for retrieving the actual logs.
           log.info("Searching for expected log: {}", expectedAttributes);
-          String operation = (String) expectedAttributes.get("Operation");
-          String remoteService = (String) expectedAttributes.get("RemoteService");
-          String remoteOperation = (String) expectedAttributes.get("RemoteOperation");
-          String remoteResourceType = (String) expectedAttributes.get("RemoteResourceType");
-          String remoteResourceIdentifier = (String) expectedAttributes.get("RemoteResourceIdentifier");
-
           Map<String, Object> actualLog;
 
-          // Parsing unique identifiers in OTLP spans
-          if (operation == null) {
-            operation = (String) expectedAttributes.get("attributes[\\\"aws.local.operation\\\"]");
-            remoteService = (String) expectedAttributes.get("attributes[\\\"aws.remote.service\\\"]");
-            remoteOperation = (String) expectedAttributes.get("attributes[\\\"aws.remote.operation\\\"]");
-            // Runtime metrics have no operation at all, we must ensure we are in the proper use case
-            if (operation != null) {
-              actualLog = this.getActualOtelSpanLog(operation, remoteService, remoteOperation);
-            } else {
-              // No operation at all -> Runtime metric
+          if (isOtlpSigV4Log(expectedAttributes)) {
+                    actualLog = this.getActualOtlpSigV4Log();
+          } else {
+            String operation = (String) expectedAttributes.get("Operation");
+            String remoteService = (String) expectedAttributes.get("RemoteService");
+            String remoteOperation = (String) expectedAttributes.get("RemoteOperation");
+            String remoteResourceType = (String) expectedAttributes.get("RemoteResourceType");
+            String remoteResourceIdentifier = (String) expectedAttributes.get("RemoteResourceIdentifier");
+
+           // Parsing unique identifiers in OTLP spans
+            if (operation == null) {
+              operation = (String) expectedAttributes.get("attributes[\\\"aws.local.operation\\\"]");
+              remoteService = (String) expectedAttributes.get("attributes[\\\"aws.remote.service\\\"]");
+              remoteOperation = (String) expectedAttributes.get("attributes[\\\"aws.remote.operation\\\"]");
+              // Runtime metrics have no operation at all, we must ensure we are in the proper use case
+              if (operation != null) {
+                actualLog = this.getActualOtelSpanLog(operation, remoteService, remoteOperation);
+              } else {
+                // No operation at all -> Runtime metric
+                actualLog =
+                  this.getActualLog(operation, remoteService, remoteOperation, remoteResourceType, remoteResourceIdentifier);
+              }
+            }
+            else {
               actualLog =
                 this.getActualLog(operation, remoteService, remoteOperation, remoteResourceType, remoteResourceIdentifier);
             }
           }
-          else {
-            actualLog =
-              this.getActualLog(operation, remoteService, remoteOperation, remoteResourceType, remoteResourceIdentifier);
-          }
           log.info("Value of an actual log: {}", actualLog);
 
           if (actualLog == null) throw new BaseException(ExceptionCode.EXPECTED_LOG_NOT_FOUND);
@@ -147,6 +151,13 @@ private JsonifyArrayList<Map<String, Object>> getExpectedAttributes() throws Exc
     return flattenedJsonMapForExpectedLogArray;
   }
 
+  private boolean isOtlpSigV4Log(Map<String, Object> expectedAttributes) {
+    // OTLP SigV4 logs have 'body' as a top-level attribute
+    return expectedAttributes.containsKey("body") &&
+           expectedAttributes.containsKey("severityNumber") &&
+           expectedAttributes.containsKey("severityText");
+  }
+
   private Map<String, Object> getActualLog(
     String operation, String remoteService, String remoteOperation, String remoteResourceType, String remoteResourceIdentifier) throws Exception {
     String dependencyFilter = null;
@@ -223,6 +234,28 @@ private Map<String, Object> getActualOtelSpanLog(String operation, String remote
     return JsonFlattener.flattenAsMap(retrievedLogs.get(0).getMessage());
   }
 
+  private Map<String, Object> getActualOtlpSigV4Log() throws Exception {
+    // Filter pattern to match OTLP SigV4 logs
+    String filterPattern = String.format(
+        "{ $.resource.attributes[\"service.name\"] = \"%s\" && $.body EXISTS && $.severityNumber EXISTS && $.severityText EXISTS }", 
+        context.getServiceName()
+    );
+    log.info("Filter Pattern for OTLP SigV4 Log Search: " + filterPattern);
+
+    List<FilteredLogEvent> retrievedLogs =
+        this.cloudWatchService.filterLogs(
+            context.getLogGroup(),
+            filterPattern,
+            System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5),
+            10);
+
+    if (retrievedLogs == null || retrievedLogs.isEmpty()) {
+        throw new BaseException(ExceptionCode.EMPTY_LIST);
+    }
+
+    return JsonFlattener.flattenAsMap(retrievedLogs.get(0).getMessage());
+  }
+
   @Override
   public void init(
       Context context,