chore: Logging and SQS utility Optimisations (#484)

* fix: logging optimisations to reduce unnecessary logics and inits * fix: lazy load sqs client Co-authored-by: Pankaj Agrawal <pankaagr@amazon.com>
aws-powertools · Jul 27, 2021 · 5354828 · 5354828
1 parent 535cbc4
commit 5354828
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/...src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java b/...src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java
@@ -56,19 +56,19 @@ public static boolean placedOnStreamHandler(final ProceedingJoinPoint pjp) {
                 && pjp.getArgs()[2] instanceof Context;
     }
 
-    public static Optional<Context> extractContext(final ProceedingJoinPoint pjp) {
+    public static Context extractContext(final ProceedingJoinPoint pjp) {
 
         if (isHandlerMethod(pjp)) {
             if (placedOnRequestHandler(pjp)) {
-                return of((Context) pjp.getArgs()[1]);
+                return (Context) pjp.getArgs()[1];
             }
 
             if (placedOnStreamHandler(pjp)) {
-                return of((Context) pjp.getArgs()[2]);
+                return (Context) pjp.getArgs()[2];
             }
         }
 
-        return empty();
+        return null;
     }
 
     public static String serviceName() {

diff --git a/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/LoggingUtils.java b/powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/LoggingUtils.java
@@ -26,7 +26,7 @@
  * {@see Logging}
  */
 public final class LoggingUtils {
-    private static ObjectMapper objectMapper = new ObjectMapper();
+    private static ObjectMapper objectMapper;
 
     private LoggingUtils() {
     }
@@ -93,6 +93,10 @@ public static void defaultObjectMapper(ObjectMapper objectMapper) {
     }
 
     public static ObjectMapper objectMapper() {
+        if(null == objectMapper) {
+            objectMapper =  new ObjectMapper();
+        }
+
         return objectMapper;
     }
 }
diff --git a/...src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java b/...src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java
@@ -23,6 +23,7 @@
 import java.util.Optional;
 import java.util.Random;
 
+import com.amazonaws.services.lambda.runtime.Context;
 import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -85,12 +86,13 @@ public Object around(ProceedingJoinPoint pjp,
 
         setLogLevelBasedOnSamplingRate(pjp, logging);
 
-        extractContext(pjp)
-                .ifPresent(context -> {
-                    appendKeys(DefaultLambdaFields.values(context));
-                    appendKey("coldStart", isColdStart() ? "true" : "false");
-                    appendKey("service", serviceName());
-                });
+        Context extractedContext = extractContext(pjp);
+
+        if(null != extractedContext) {
+            appendKeys(DefaultLambdaFields.values(extractedContext));
+            appendKey("coldStart", isColdStart() ? "true" : "false");
+            appendKey("service", serviceName());
+        }
 
         getXrayTraceId().ifPresent(xRayTraceId -> appendKey("xray_trace_id", xRayTraceId));
 
@@ -120,9 +122,9 @@ private static void resetLogLevels(Level logLevel) {
 
     private void setLogLevelBasedOnSamplingRate(final ProceedingJoinPoint pjp,
                                                 final Logging logging) {
+        double samplingRate = samplingRate(logging);
+
         if (isHandlerMethod(pjp)) {
-            float sample = SAMPLER.nextFloat();
-            double samplingRate = samplingRate(logging);
 
             if (samplingRate < 0 || samplingRate > 1) {
                 LOG.debug("Skipping sampling rate configuration because of invalid value. Sampling rate: {}", samplingRate);
@@ -131,6 +133,12 @@ private void setLogLevelBasedOnSamplingRate(final ProceedingJoinPoint pjp,
 
             appendKey("samplingRate", String.valueOf(samplingRate));
 
+            if (samplingRate == 0) {
+                return;
+            }
+
+            float sample = SAMPLER.nextFloat();
+
             if (samplingRate > sample) {
                 resetLogLevels(Level.DEBUG);
 

diff --git a/...src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java b/...src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Field;
 
+import com.amazonaws.services.lambda.runtime.Context;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -53,10 +54,12 @@ public Object around(ProceedingJoinPoint pjp,
 
             logger.setNamespace(namespace(metrics));
 
-            extractContext(pjp).ifPresent((context) -> {
-                coldStartSingleMetricIfApplicable(context.getAwsRequestId(), context.getFunctionName(), metrics);
-                logger.putProperty(REQUEST_ID_PROPERTY, context.getAwsRequestId());
-            });
+            Context extractedContext = extractContext(pjp);
+
+            if( null != extractedContext) {
+                coldStartSingleMetricIfApplicable(extractedContext.getAwsRequestId(), extractedContext.getFunctionName(), metrics);
+                logger.putProperty(REQUEST_ID_PROPERTY, extractedContext.getAwsRequestId());
+            }
 
             LambdaHandlerProcessor.getXrayTraceId()
                     .ifPresent(traceId -> logger.putProperty(TRACE_ID_PROPERTY, traceId));

diff --git a/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/SqsUtils.java b/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/SqsUtils.java
@@ -41,7 +41,7 @@ public final class SqsUtils {
     private static final Logger LOG = LoggerFactory.getLogger(SqsUtils.class);
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
-    private static SqsClient client = SqsClient.create();
+    private static SqsClient client;
 
     private SqsUtils() {
     }
@@ -231,6 +231,10 @@ public static <R> List<R> batchProcessor(final SQSEvent event,
                                              final SqsMessageHandler<R> handler) {
         final List<R> handlerReturn = new ArrayList<>();
 
+        if(client == null) {
+            client = SqsClient.create();
+        }
+
         BatchContext batchContext = new BatchContext(client);
 
         for (SQSMessage message : event.getRecords()) {