chore: move trace id logic to core for reuse

Author: Pankaj Agrawal

powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java

@@ -24,6 +24,7 @@
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
+import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
 
 public final class LambdaHandlerProcessor {
     // SERVICE_NAME cannot be final for testing purposes
@@ -83,4 +84,12 @@ public static void coldStartDone() {
     public static boolean isSamLocal() {
         return "true".equals(System.getenv("AWS_SAM_LOCAL"));
     }
+
+    public static Optional<String> getXrayTraceId() {
+        final String X_AMZN_TRACE_ID = getenv("_X_AMZN_TRACE_ID");
+        if(X_AMZN_TRACE_ID != null) {
+            return of(X_AMZN_TRACE_ID.split(";")[0].replace("Root=", ""));
+        }
+        return empty();
+    }
 }

…ools/logging/internal/SystemWrapper.java …ertools/core/internal/SystemWrapper.javapowertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/SystemWrapper.java renamed to powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/SystemWrapper.java powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/SystemWrapper.java renamed to powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/SystemWrapper.java

@@ -1,6 +1,6 @@
-package software.amazon.lambda.powertools.logging.internal;
+package software.amazon.lambda.powertools.core.internal;
 
-class SystemWrapper {
+public class SystemWrapper {
     private SystemWrapper() {
     }
 

powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java

@@ -39,18 +39,17 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Optional.empty;
-import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.coldStartDone;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.extractContext;
+import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.getXrayTraceId;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isColdStart;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.isHandlerMethod;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnStreamHandler;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName;
 import static software.amazon.lambda.powertools.logging.LoggingUtils.appendKey;
 import static software.amazon.lambda.powertools.logging.LoggingUtils.appendKeys;
-import static software.amazon.lambda.powertools.logging.internal.SystemWrapper.getenv;
 
 @Aspect
 public final class LambdaLoggingAspect {
@@ -200,12 +199,4 @@ private Optional<String> asJson(final ProceedingJoinPoint pjp,
     private Logger logger(final ProceedingJoinPoint pjp) {
         return LogManager.getLogger(pjp.getSignature().getDeclaringType());
     }
-
-    private static Optional<String> getXrayTraceId() {
-        final String X_AMZN_TRACE_ID = getenv("_X_AMZN_TRACE_ID");
-        if(X_AMZN_TRACE_ID != null) {
-            return of(X_AMZN_TRACE_ID.split(";")[0].replace("Root=", ""));
-        }
-        return empty();
-    }
 }

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java

@@ -41,6 +41,7 @@
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
+import software.amazon.lambda.powertools.core.internal.SystemWrapper;
 import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabled;
 import software.amazon.lambda.powertools.logging.handlers.PowerLogToolEnabledForStream;
 import software.amazon.lambda.powertools.logging.handlers.PowerToolDisabled;
@@ -65,7 +66,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
-import static software.amazon.lambda.powertools.logging.internal.SystemWrapper.getenv;
+import static software.amazon.lambda.powertools.core.internal.SystemWrapper.getenv;
 
 class LambdaLoggingAspectTest {