Adding a custom log to verify the validation

Author: Jeel Mehta

sample-apps/python/django_frontend_service/frontend_service_app/views.py

@@ -47,6 +47,7 @@ def run_scheduler():
 run_local_root_client_call_recurring_service()
 
 def healthcheck(request):
+    logger.warn("This is a custom log for validation testing")
     return HttpResponse("healthcheck")
 
 def aws_sdk_call(request):

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

@@ -68,7 +68,8 @@ public void validate() throws Exception {
           Map<String, Object> actualLog;
 
           if (isOtlpSigV4Log(expectedAttributes)) {
-                    actualLog = this.getActualOtlpSigV4Log();
+                    String traceId = (String) expectedAttributes.get("traceId");
+                    actualLog = this.getActualOtlpSigV4Log(traceId);
           } else {
             String operation = (String) expectedAttributes.get("Operation");
             String remoteService = (String) expectedAttributes.get("RemoteService");
@@ -234,12 +235,20 @@ 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(
-        "{ ($.attributes.otelServiceName = \"%s\") }", 
-        context.getServiceName()
-    );
+  private Map<String, Object> getActualOtlpSigV4Log(String traceId) throws Exception {
+    String filterPattern;
+    if (traceId != null && !traceId.isEmpty()) {
+        filterPattern = String.format(
+            "{ ($.attributes.otelServiceName = \"%s\") && ($.traceId = \"%s\") && ($.body = \"This is a custom log for validation testing\") }",
+            context.getServiceName(),
+            traceId
+        );
+    } else {
+        filterPattern = String.format(
+            "{ ($.attributes.otelServiceName = \"%s\") && ($.body = \"This is a custom log for validation testing\") }",
+            context.getServiceName()
+        );
+    }
     log.info("Filter Pattern for OTLP SigV4 Log Search: " + filterPattern);
 
     List<FilteredLogEvent> retrievedLogs =

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

@@ -11,7 +11,7 @@
   },
   "severityNumber": "^[0-9]+$",
   "severityText": "{{severityText}}",
-  "body": "{{body}}",
+  "body": "This is a custom log for validation testing",
   "traceId": "{{traceId}}",
   "spanId": "{{spanId}}",
   "attributes": {