Rename annotation to make it consistent with logger (#32)

Author: pankajagrawal16

example/HelloWorldFunction/src/main/java/helloworld/App.java

@@ -18,7 +18,7 @@
 import org.apache.logging.log4j.Logger;
 import software.amazon.lambda.logging.PowerLogger;
 import software.amazon.lambda.logging.PowerToolsLogging;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 import software.amazon.lambda.tracing.PowerTracer;
 
 import static software.amazon.lambda.tracing.PowerTracer.putMetadata;
@@ -32,9 +32,10 @@ public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatew
     Logger log = LogManager.getLogger();
 
     @PowerToolsLogging(logEvent = true)
-    @PowerToolTracing
+    @PowerToolsTracing
     public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
         Map<String, String> headers = new HashMap<>();
+
         headers.put("Content-Type", "application/json");
         headers.put("X-Custom-Header", "application/json");
 
@@ -89,13 +90,13 @@ private void threadOption2() throws InterruptedException {
         anotherThread.join();
     }
 
-    @PowerToolTracing
+    @PowerToolsTracing
     private void log() {
         log.info("inside threaded logging for function");
     }
 
 
-    @PowerToolTracing(namespace = "getPageContents", captureResponse = false, captureError = false)
+    @PowerToolsTracing(namespace = "getPageContents", captureResponse = false, captureError = false)
     private String getPageContents(String address) throws IOException {
         URL url = new URL(address);
         putMetadata("getPageContents", address);

…zon/lambda/tracing/PowerToolTracing.java …on/lambda/tracing/PowerToolsTracing.javasrc/main/java/software/amazon/lambda/tracing/PowerToolTracing.java renamed to src/main/java/software/amazon/lambda/tracing/PowerToolsTracing.java src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java renamed to src/main/java/software/amazon/lambda/tracing/PowerToolsTracing.java

@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface PowerToolTracing {
+public @interface PowerToolsTracing {
     String namespace() default "";
     boolean captureResponse() default true;
     boolean captureError() default true;

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

@@ -7,7 +7,7 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.coldStartDone;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.isColdStart;
@@ -21,12 +21,12 @@ public final class LambdaTracingAspect {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     @Pointcut("@annotation(powerToolsTracing)")
-    public void callAt(PowerToolTracing powerToolsTracing) {
+    public void callAt(PowerToolsTracing powerToolsTracing) {
     }
 
-    @Around(value = "callAt(powerToolsTracing) && execution(@PowerToolTracing * *.*(..))", argNames = "pjp,powerToolsTracing")
+    @Around(value = "callAt(powerToolsTracing) && execution(@PowerToolsTracing * *.*(..))", argNames = "pjp,powerToolsTracing")
     public Object around(ProceedingJoinPoint pjp,
-                         PowerToolTracing powerToolsTracing) throws Throwable {
+                         PowerToolsTracing powerToolsTracing) throws Throwable {
         Object[] proceedArgs = pjp.getArgs();
         Subsegment segment;
 
@@ -58,7 +58,7 @@ public Object around(ProceedingJoinPoint pjp,
         }
     }
 
-    private String namespace(PowerToolTracing powerToolsTracing) {
+    private String namespace(PowerToolsTracing powerToolsTracing) {
         return powerToolsTracing.namespace().isEmpty() ? serviceName() : powerToolsTracing.namespace();
     }
 

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

@@ -2,12 +2,12 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 
 public class PowerTracerToolEnabled implements RequestHandler<Object, Object> {
 
     @Override
-    @PowerToolTracing(namespace = "lambdaHandler")
+    @PowerToolsTracing(namespace = "lambdaHandler")
     public Object handleRequest(Object input, Context context) {
         return null;
     }

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

@@ -5,12 +5,12 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 
 public class PowerTracerToolEnabledForStream implements RequestStreamHandler {
 
     @Override
-    @PowerToolTracing(namespace = "streamHandler")
+    @PowerToolsTracing(namespace = "streamHandler")
     public void handleRequest(InputStream input, OutputStream output, Context context) {
 
     }

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

@@ -5,12 +5,12 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 
 public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler {
 
     @Override
-    @PowerToolTracing(captureResponse = false, captureError = false)
+    @PowerToolsTracing(captureResponse = false, captureError = false)
     public void handleRequest(InputStream input, OutputStream output, Context context) {
 
     }

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

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

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

@@ -2,12 +2,12 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolsTracing;
 
 public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler<Object, Object> {
 
     @Override
-    @PowerToolTracing(captureResponse = false, captureError = false)
+    @PowerToolsTracing(captureResponse = false, captureError = false)
     public Object handleRequest(Object input, Context context) {
         return null;
     }