From 5830cb6a2efc23704ffef9a12a38c364fa5134ae Mon Sep 17 00:00:00 2001
From: sundaresanr <sundar@exaforce.com>
Date: Wed, 8 Jul 2026 20:45:44 -0700
Subject: [PATCH] debug(aws_s3 source): log AWS SDK error metadata for SQS
 delete failures

Include AWS error code and message in SQS batch delete errors so the
underlying service failure is visible without enabling aws-sdk debug
logging.
---
 src/internal_events/aws_sqs.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/internal_events/aws_sqs.rs b/src/internal_events/aws_sqs.rs
index 4bdcc8ef48e6c..36ae42aeaee05 100644
--- a/src/internal_events/aws_sqs.rs
+++ b/src/internal_events/aws_sqs.rs
@@ -15,6 +15,7 @@ mod s3 {
         BatchResultErrorEntry, DeleteMessageBatchRequestEntry, DeleteMessageBatchResultEntry,
         SendMessageBatchRequestEntry, SendMessageBatchResultEntry,
     };
+    use aws_smithy_types::error::metadata::ProvideErrorMetadata;
     use metrics::histogram;
 
     use super::*;
@@ -137,7 +138,7 @@ mod s3 {
         pub error: E,
     }
 
-    impl<E: std::fmt::Display> InternalEvent for SqsMessageDeleteBatchError<E> {
+    impl<E: std::fmt::Display + ProvideErrorMetadata> InternalEvent for SqsMessageDeleteBatchError<E> {
         fn emit(self) {
             error!(
                 message = "Deletion of SQS message(s) failed.",
@@ -146,6 +147,12 @@ mod s3 {
                     .collect::<Vec<_>>()
                     .join(", "),
                 error = %self.error,
+                // `Display` for aws SdkError is terse ("service error"); surface the
+                // actual SQS error code/message from the error metadata so the real
+                // cause (throttling, invalid parameter, 5xx, ...) is visible at ERROR
+                // level without turning on aws-sdk debug logging.
+                aws_error_code = self.error.code().unwrap_or("unknown"),
+                aws_error_message = self.error.message().unwrap_or(""),
                 error_code = "failed_deleting_all_sqs_messages",
                 error_type = error_type::ACKNOWLEDGMENT_FAILED,
                 stage = error_stage::PROCESSING,