logs and doc

Author: jeromevdl

docs/utilities/large_messages.md

@@ -334,8 +334,8 @@ using the `deleteObject(bucket, key)` API. You can disable the deletion of S3 ob
 
 !!! tip "Use together with idempotency module"
     This utility also works together with the idempotency module (`powertools-idempotency`). 
-    You can add both the `@LargeMessage` and `@Idempotent` annotations to the same method. 
-    The `@Idempotent` takes precedence over the `@LargeMessage` annotation. 
+    You can add both the `@LargeMessage` and `@Idempotent` annotations, in any order, to the same method. 
+    The `@Idempotent` takes precedence over the `@LargeMessage` annotation.
     It means Idempotency module will use the initial raw message (containing the S3 pointer) and not the large message.
     Using the large message would end up with potential issues when inserting the data in DynamoDB, where items
     are limited to 400 KB (while large messages can be up to 2 GB).

powertools-large-messages/src/main/java/software/amazon/lambda/powertools/largemessages/internal/LargeMessageProcessor.java

@@ -16,6 +16,7 @@
 
 import static java.lang.String.format;
 
+import java.nio.charset.StandardCharsets;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,19 +58,26 @@ public Object process(ProceedingJoinPoint pjp, boolean deleteS3Object) throws Th
         // legacy attribute (sqs only)
         payloadPointer = payloadPointer.replace("com.amazon.sqs.javamessaging.MessageS3Pointer", "software.amazon.payloadoffloading.PayloadS3Pointer");
 
-        LOG.info("Large message [{}]: retrieving content from S3", getMessageId(message));
+        if (LOG.isInfoEnabled()) {
+            LOG.info("Large message [{}]: retrieving content from S3", getMessageId(message));
+        }
 
         String s3ObjectContent = getS3ObjectContent(payloadPointer);
 
-        LOG.debug("Large message [{}]: {}", getMessageId(message), s3ObjectContent);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Large message [{}] retrieved in S3 [{}]: {}KB", getMessageId(message), payloadPointer,
+                    s3ObjectContent.getBytes(StandardCharsets.UTF_8).length / 1024);
+        }
 
         updateMessageContent(message, s3ObjectContent);
         removeLargeMessageAttributes(message);
 
         Object response = pjp.proceed(proceedArgs);
 
         if (deleteS3Object) {
-            LOG.info("Large message [{}]: deleting object from S3", getMessageId(message));
+            if (LOG.isInfoEnabled()) {
+                LOG.info("Large message [{}]: deleting object from S3", getMessageId(message));
+            }
             deleteS3Object(payloadPointer);
         }
 
@@ -127,7 +135,6 @@ private void deleteS3Object(String payloadPointer) {
         try {
             payloadStore.deleteOriginalPayload(payloadPointer);
         } catch (SdkException e) {
-            // TODO: should we actually throw an exception if deletion failed ?
             throw new LargeMessageProcessingException(format("Failed deleting S3 record [%s]", payloadPointer), e);
         }
     }