Delete old Store implementation + change message on debug

Author: ndakkoune

aws/logs_monitoring_go/internal/storing/sqs.go

@@ -40,68 +40,6 @@ func newSQS(client sdkclient.SQS, queue string) *SQS {
 	return &SQS{client: client, queue: queue}
 }
 
-// func (s *SQS) Store(ctx context.Context, storedBatch Batch) error {
-// 	var jsonLogs []json.RawMessage
-// 	if err := json.Unmarshal(storedBatch.Data, &jsonLogs); err != nil {
-// 		return fmt.Errorf("unmarshal: %w", err)
-// 	}
-
-// 	var (
-// 		entries      []types.SendMessageBatchRequestEntry
-// 		currentChunk []json.RawMessage
-// 		batchID      int
-// 		messageSize  = 2 // '[' and ']'
-// 		batchSize    int
-// 	)
-
-// 	for _, jsonLog := range jsonLogs {
-// 		if len(jsonLog) > maxSizePerSQSMessage {
-// 			slog.WarnContext(ctx, "log size exceeds SQS message limit, dropping", slog.Int("size", len(jsonLog)))
-// 			continue
-// 		}
-
-// 		logSize := len(jsonLog)
-// 		if len(currentChunk) > 0 {
-// 			logSize++ // ',' separator
-// 		}
-
-// 		if messageSize+logSize > maxSizePerSQSMessage {
-// 			entry, err := s.buildEntry(batchID, currentChunk, storedBatch.StorageTag)
-// 			if err != nil {
-// 				return err
-// 			}
-
-// 			if len(entries) >= maxMessagePerBatch || batchSize+messageSize > maxSizePerSQSBatch {
-// 				if err := s.sendBatch(ctx, entries); err != nil {
-// 					return err
-// 				}
-// 				entries = entries[:0]
-// 				batchSize = 0
-// 			}
-
-// 			entries = append(entries, entry)
-// 			batchSize += messageSize
-// 			batchID++
-// 			currentChunk = currentChunk[:0]
-// 			messageSize = 2
-// 			logSize = len(jsonLog)
-// 		}
-
-// 		currentChunk = append(currentChunk, jsonLog)
-// 		messageSize += logSize
-// 	}
-
-// 	if len(currentChunk) > 0 {
-// 		entry, err := s.buildEntry(batchID, currentChunk, storedBatch.StorageTag)
-// 		if err != nil {
-// 			return err
-// 		}
-// 		entries = append(entries, entry)
-// 	}
-
-// 	return s.sendBatch(ctx, entries)
-// }
-
 func (s *SQS) Store(ctx context.Context, storedBatch Batch) error {
 	var logs []json.RawMessage
 	if err := json.Unmarshal(storedBatch.Data, &logs); err != nil {
@@ -159,13 +97,12 @@ func (s *SQS) send(ctx context.Context, entries []types.SendMessageBatchRequestE
 	if len(out.Failed) > 0 {
 		for _, e := range out.Failed {
 			slog.DebugContext(ctx, "failed to send SQS message",
-				slog.String("id", aws.ToString(e.Id)),
 				slog.String("code", aws.ToString(e.Code)),
 				slog.String("message", aws.ToString(e.Message)),
 				slog.Bool("sender_fault", e.SenderFault),
 			)
 		}
-		return fmt.Errorf("%d/%d messages failed to send", len(out.Failed), len(out.Failed)+len(out.Successful))
+		return fmt.Errorf("failed to send %d/%d messages", len(out.Failed), len(out.Failed)+len(out.Successful))
 	}
 
 	return nil