test: Tracer tests (#21)

* Test cases for tracers

* Move all test handlers to a package

* test cases for the aspect and utils

Co-authored-by: Pankaj Agrawal <[email protected]>

Author: pankajagrawal16

src/main/java/software/aws/lambda/tracing/PowerTracer.java

@@ -29,11 +29,21 @@ public static void putMetadata(String namespace, String key, Object value) {
 
     public static void withEntitySubsegment(String name, Entity entity, Consumer<Subsegment> subsegment) {
         AWSXRay.setTraceEntity(entity);
-        withSubsegment(name, subsegment);
+        withEntitySubsegment(SERVICE_NAME, name, entity, subsegment);
+    }
+
+    public static void withEntitySubsegment(String namespace, String name, Entity entity, Consumer<Subsegment> subsegment) {
+        AWSXRay.setTraceEntity(entity);
+        withSubsegment(namespace, name, subsegment);
     }
 
     public static void withSubsegment(String name, Consumer<Subsegment> subsegment) {
+        withSubsegment(SERVICE_NAME, name, subsegment);
+    }
+
+    public static void withSubsegment(String namespace, String name, Consumer<Subsegment> subsegment) {
         Subsegment segment = AWSXRay.beginSubsegment("## " + name);
+        segment.setNamespace(namespace);
         try {
             subsegment.accept(segment);
         } finally {

src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java

@@ -42,7 +42,7 @@ public Object around(ProceedingJoinPoint pjp,
         try {
             Object methodReturn = pjp.proceed(proceedArgs);
             if (powerToolsTracing.captureResponse()) {
-                segment.putMetadata(namespace(powerToolsTracing), pjp.getSignature().getName() + " response", response(pjp, methodReturn));
+                segment.putMetadata(namespace(powerToolsTracing), pjp.getSignature().getName() + " response", methodReturn);
             }
 
             IS_COLD_START = false;
@@ -58,15 +58,6 @@ public Object around(ProceedingJoinPoint pjp,
         }
     }
 
-    private Object response(ProceedingJoinPoint pjp, Object methodReturn) {
-        // TODO should we try to parse output stream? or just not support it?
-        if (placedOnStreamHandler(pjp)) {
-
-        }
-
-        return methodReturn;
-    }
-
     private String namespace(PowerToolTracing powerToolsTracing) {
         return powerToolsTracing.namespace().isEmpty() ? SERVICE_NAME : powerToolsTracing.namespace();
     }

src/test/java/software/aws/lambda/logging/internal/PowerLogToolEnabled.java renamed to src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;

src/test/java/software/aws/lambda/logging/internal/PowerLogToolEnabledForStream.java renamed to src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;

src/test/java/software/aws/lambda/logging/internal/PowerLogToolDisabled.java renamed to src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java

@@ -1,9 +1,9 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 
-public class PowerLogToolDisabled implements RequestHandler<Object, Object> {
+public class PowerToolDisabled implements RequestHandler<Object, Object> {
 
     @Override
     public Object handleRequest(Object input, Context context) {

src/test/java/software/aws/lambda/logging/internal/PowerLogToolDisabledForStream.java renamed to src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java

@@ -1,12 +1,12 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 
-public class PowerLogToolDisabledForStream implements RequestStreamHandler {
+public class PowerToolDisabledForStream implements RequestStreamHandler {
 
     @Override
     public void handleRequest(InputStream input, OutputStream output, Context context) {

src/test/java/software/aws/lambda/logging/internal/PowerToolLogEventEnabled.java renamed to src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;

src/test/java/software/aws/lambda/logging/internal/PowerToolLogEventEnabledForStream.java renamed to src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java

@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.aws.lambda.handlers;
 
 import java.io.IOException;
 import java.io.InputStream;

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java

@@ -0,0 +1,14 @@
+package software.aws.lambda.handlers;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.aws.lambda.tracing.PowerToolTracing;
+
+public class PowerTracerToolEnabled implements RequestHandler<Object, Object> {
+
+    @Override
+    @PowerToolTracing(namespace = "lambdaHandler")
+    public Object handleRequest(Object input, Context context) {
+        return null;
+    }
+}

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java

@@ -0,0 +1,17 @@
+package software.aws.lambda.handlers;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import software.aws.lambda.tracing.PowerToolTracing;
+
+public class PowerTracerToolEnabledForStream implements RequestStreamHandler {
+
+    @Override
+    @PowerToolTracing(namespace = "streamHandler")
+    public void handleRequest(InputStream input, OutputStream output, Context context) {
+
+    }
+}

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java

@@ -0,0 +1,17 @@
+package software.aws.lambda.handlers;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import software.aws.lambda.tracing.PowerToolTracing;
+
+public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler {
+
+    @Override
+    @PowerToolTracing(captureResponse = false, captureError = false)
+    public void handleRequest(InputStream input, OutputStream output, Context context) {
+
+    }
+}

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java

@@ -0,0 +1,14 @@
+package software.aws.lambda.handlers;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.aws.lambda.tracing.PowerToolTracing;
+
+public class PowerTracerToolEnabledWithException implements RequestHandler<Object, Object> {
+
+    @Override
+    @PowerToolTracing(namespace = "lambdaHandler")
+    public Object handleRequest(Object input, Context context) {
+        throw new RuntimeException("I am failing!");
+    }
+}

src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java

@@ -0,0 +1,14 @@
+package software.aws.lambda.handlers;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.aws.lambda.tracing.PowerToolTracing;
+
+public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler<Object, Object> {
+
+    @Override
+    @PowerToolTracing(captureResponse = false, captureError = false)
+    public Object handleRequest(Object input, Context context) {
+        return null;
+    }
+}

src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java

@@ -15,6 +15,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
+import software.aws.lambda.handlers.PowerToolDisabled;
+import software.aws.lambda.handlers.PowerToolDisabledForStream;
+import software.aws.lambda.handlers.PowerLogToolEnabled;
+import software.aws.lambda.handlers.PowerLogToolEnabledForStream;
+import software.aws.lambda.handlers.PowerToolLogEventEnabled;
+import software.aws.lambda.handlers.PowerToolLogEventEnabledForStream;
 import software.aws.lambda.internal.LambdaHandlerProcessor;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -84,7 +90,7 @@ void shouldSetColdStartFlag() throws IOException {
 
     @Test
     void shouldNotSetLambdaContextWhenDisabled() {
-        requestHandler = new PowerLogToolDisabled();
+        requestHandler = new PowerToolDisabled();
 
         requestHandler.handleRequest(new Object(), context);
 
@@ -94,7 +100,7 @@ void shouldNotSetLambdaContextWhenDisabled() {
 
     @Test
     void shouldNotSetLambdaContextForStreamHandlerWhenDisabled() throws IOException {
-        requestStreamHandler = new PowerLogToolDisabledForStream();
+        requestStreamHandler = new PowerToolDisabledForStream();
 
         requestStreamHandler.handleRequest(null, null, context);