From fe5de2e17a5b150b569669ddf0969a00c050aa05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?France=CC=81=20Wilke?= <francewilke@gmail.com>
Date: Thu, 31 Aug 2023 13:55:29 +0200
Subject: [PATCH] Improve SQS logging

---
 logs/logs.go | 21 +++++++++++++++++++--
 sqs/sqs.go   |  1 -
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/logs/logs.go b/logs/logs.go
index de35054..ca8d401 100644
--- a/logs/logs.go
+++ b/logs/logs.go
@@ -266,9 +266,26 @@ func LogApiAudit(fields log.Fields) {
 }
 
 func LogSQSEvent(event events.SQSEvent) {
+	sqsReducedEvents := []map[string]string{}
+
+	for _, record := range event.Records {
+		reducedEvent := map[string]string{
+			"message_id": record.MessageId,
+			"body":       record.Body,
+			"sender":     record.Attributes["SenderId"],
+		}
+
+		for key, attribute := range record.MessageAttributes {
+			if key != "Name" {
+				reducedEvent[key] = *attribute.StringValue
+			}
+		}
+		sqsReducedEvents = append(sqsReducedEvents, reducedEvent)
+	}
+
 	InfoWithFields(map[string]interface{}{
-		"records": event.Records,
-	}, "SQS event start")
+		"records": sqsReducedEvents,
+	}, "")
 }
 
 func SetOutputToFile(file *os.File) {
diff --git a/sqs/sqs.go b/sqs/sqs.go
index 67ead6c..cf452f7 100644
--- a/sqs/sqs.go
+++ b/sqs/sqs.go
@@ -135,7 +135,6 @@ func SendSQSMessage(msgr Messenger, objectToSend interface{}, currentRequestID *
 
 	message := string(jsonBytes)
 	headers := map[string]string{
-		"Name":            "dummy",
 		SQSMessageOnS3Key: "false",
 	}
 
-- 
GitLab