Changing the filter pattern for validating logs

Author: Jeel Mehta

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

@@ -68,7 +68,7 @@ public void validate() throws Exception {
           Map<String, Object> actualLog;
 
           if (isOtlpSigV4Log(expectedAttributes)) {
-                    actualLog = this.getActualOtlpSigV4Log();
+                    actualLog = this.getActualOtlpSigV4Log(expectedAttributes);
           } else {
             String operation = (String) expectedAttributes.get("Operation");
             String remoteService = (String) expectedAttributes.get("RemoteService");
@@ -234,11 +234,14 @@ private Map<String, Object> getActualOtelSpanLog(String operation, String remote
     return JsonFlattener.flattenAsMap(retrievedLogs.get(0).getMessage());
   }
 
-  private Map<String, Object> getActualOtlpSigV4Log() throws Exception {
+  private Map<String, Object> getActualOtlpSigV4Log(Map<String, Object> expectedAttributes) 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()
+        "{ ($.attributes.otelServiceName = \"%s\") && ($.severityNumber = \"%s\") && ($.severityText = \"%s\") && ($.body = \"%s\") }", 
+        context.getServiceName(),
+        expectedAttributes.get("severityNumber"),
+        expectedAttributes.get("severityText"),
+        expectedAttributes.get("body")
     );
     log.info("Filter Pattern for OTLP SigV4 Log Search: " + filterPattern);
 

validator/src/main/resources/expected-data-template/python/ec2/adot-sigv4/logs/log.mustache

@@ -13,5 +13,8 @@
   "severityText": "{{severityText}}",
   "body": "{{body}}",
   "traceId": "{{traceId}}",
-  "spanId": "{{spanId}}"
+  "spanId": "{{spanId}}",
+  "attributes": {
+    "otelServiceName": "{{serviceName}}"
+  }
 }]