Changing the filter pattern for validating logs

Author: Jeel Mehta

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

@@ -237,8 +237,8 @@ private Map<String, Object> getActualOtelSpanLog(String operation, String remote
   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()
+        "{ ($.attributes.otelServiceName = \"%s\") }", 
+        context.getServiceName(),
     );
     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}}"
+  }
 }]