From 09ba53aada563b9dd07efe6d1e7c3e1097adb0ae Mon Sep 17 00:00:00 2001
From: "T.J Ariyawansa" <tjariy@amazon.com>
Date: Mon, 30 Mar 2026 22:21:51 -0400
Subject: [PATCH] fix(eval): filter scopeless spans in CloudWatch query

Add ispresent(scope.name) filter to the span query so entries
missing the required scope field are excluded before being sent
to the Evaluate API.
---
 src/cli/operations/eval/run-eval.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cli/operations/eval/run-eval.ts b/src/cli/operations/eval/run-eval.ts
index 68401d14..d130438f 100644
--- a/src/cli/operations/eval/run-eval.ts
+++ b/src/cli/operations/eval/run-eval.ts
@@ -446,7 +446,8 @@ async function fetchSessionSpans(opts: FetchSpansOptions): Promise<SessionSpans[
   // 1. Query proper OTel spans from the aws/spans log group
   let spanQuery = `fields @message, attributes.session.id as sessionId, traceId
      | parse resource.attributes.cloud.resource_id "runtime/*/" as parsedAgentId
-     | filter parsedAgentId = '${sanitizeQueryValue(runtimeId)}'`;
+     | filter parsedAgentId = '${sanitizeQueryValue(runtimeId)}'
+     | filter ispresent(scope.name)`;
 
   if (opts.sessionId) {
     spanQuery += `\n     | filter attributes.session.id = '${sanitizeQueryValue(opts.sessionId)}'`;