chore: upgrade AspectjGradlePlugin to latest and example project to java 11 (#189)

Author: pankajagrawal16

.github/workflows/build-docs.yml

@@ -25,9 +25,8 @@ jobs:
       - name: Capture branch and tag
         id: branch_name
         run: |
-          echo ::set-env name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
-          echo ::set-env name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
+          echo "SOURCE_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+          echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: install dependencies
         run: make dev-docs
       - name: Build docs website

.github/workflows/docs.yml

@@ -18,9 +18,8 @@ jobs:
       - name: Capture branch and tag
         id: branch_name
         run: |
-          echo ::set-env name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
-          echo ::set-env name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
+          echo "SOURCE_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+          echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: install dependencies
         run: make dev-docs
       - name: Build docs website

docs/content/index.mdx

@@ -79,7 +79,7 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
 ```groovy
 plugins{
     id 'java'
-    id 'aspectj.AspectjGradlePlugin' version '0.0.3'
+    id 'aspectj.AspectjGradlePlugin' version '0.0.6'
 }
 repositories {
     jcenter()
@@ -94,8 +94,10 @@ dependencies {
 }
 ```
 
-**Note:** Please add `aspectjVersion = '1.9.6'` to the `gradle.properties` file. The aspectj plugin works at the moment with gradle 5.x only.
-Please refer to [open issue](https://github.com/awslabs/aws-lambda-powertools-java/issues/146) for more details.
+**Note:**
+
+Please add `aspectjVersion = '1.9.6'` to the `gradle.properties` file. The aspectj plugin works at the moment with gradle 5.x only if
+you are using `java 8` as runtime. Please refer to [open issue](https://github.com/awslabs/aws-lambda-powertools-java/issues/146) for more details.
 
 ## Environment variables
 

example/HelloWorldFunction/build.gradle

@@ -1,6 +1,6 @@
 plugins{
     id 'java'
-    id 'aspectj.AspectjGradlePlugin' version '0.0.3'
+    id 'aspectj.AspectjGradlePlugin' version '0.0.6'
 }
 
 repositories {
@@ -23,6 +23,9 @@ dependencies {
     implementation 'software.amazon.lambda:powertools-parameters:1.0.0'
     aspectpath 'software.amazon.lambda:powertools-parameters:1.0.0'
 
+    implementation 'software.amazon.lambda:powertools-validation:1.0.0'
+    aspectpath 'software.amazon.lambda:powertools-validation:1.0.0'
+
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.0'
     implementation 'com.amazonaws:aws-lambda-java-events:3.1.0'
 

example/HelloWorldFunction/pom.xml

@@ -7,8 +7,8 @@
     <packaging>jar</packaging>
     <name>A sample Hello World created for SAM CLI.</name>
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <log4j.version>2.13.2</log4j.version>
     </properties>
 
@@ -80,9 +80,10 @@
     <build>
       <plugins>
         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
+            <!-- Refer https://github.com/awslabs/aws-lambda-powertools-java/issues/50 -->
+             <groupId>com.nickwongdev</groupId>
              <artifactId>aspectj-maven-plugin</artifactId>
-             <version>1.11</version>
+             <version>1.12.6</version>
              <configuration>
                  <source>${maven.compiler.source}</source>
                  <target>${maven.compiler.target}</target>

example/template.yaml

@@ -9,14 +9,14 @@ Description: >
 Globals:
   Function:
     Timeout: 20
+    Runtime: java11
 
 Resources:
   HelloWorldFunction:
     Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.App::handleRequest
-      Runtime: java8
       MemorySize: 512
       Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
         Variables:
@@ -35,7 +35,6 @@ Resources:
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.AppValidation::handleRequest
-      Runtime: java8
       MemorySize: 512
       Tracing: Active
       Events:
@@ -50,7 +49,6 @@ Resources:
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.AppStream::handleRequest
-      Runtime: java8
       MemorySize: 512
       Tracing: Active
       Environment:
@@ -68,7 +66,6 @@ Resources:
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.AppParams::handleRequest
-      Runtime: java8
       MemorySize: 512
       Tracing: Active
       Policies:
@@ -148,7 +145,6 @@ Resources:
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.AppSqsEvent::handleRequest
-      Runtime: java8
       MemorySize: 512
       Tracing: Active
       Policies:
@@ -174,7 +170,6 @@ Resources:
     Properties:
       CodeUri: HelloWorldFunction
       Handler: helloworld.AppSqsEventUtil::handleRequest
-      Runtime: java8
       MemorySize: 512
       Tracing: Active
       Policies:

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

@@ -78,4 +78,8 @@ public static boolean isColdStart() {
     public static void coldStartDone() {
         IS_COLD_START = false;
     }
+
+    public static boolean isSamLocal() {
+        return "true".equals(System.getenv("AWS_SAM_LOCAL"));
+    }
 }

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

@@ -24,6 +24,7 @@
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.coldStartDone;
 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.isSamLocal;
 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;
@@ -62,7 +63,9 @@ public Object around(ProceedingJoinPoint pjp,
             }
             throw e;
         } finally {
-            AWSXRay.endSubsegment();
+            if (!isSamLocal()) {
+                AWSXRay.endSubsegment();
+            }
         }
     }
 

powertools-tracing/src/test/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspectTest.java

@@ -25,20 +25,20 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
+import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
 import software.amazon.lambda.powertools.tracing.handlers.PowerToolDisabled;
 import software.amazon.lambda.powertools.tracing.handlers.PowerToolDisabledForStream;
 import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabled;
 import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledForStream;
 import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledForStreamWithNoMetaData;
 import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledWithException;
 import software.amazon.lambda.powertools.tracing.handlers.PowerTracerToolEnabledWithNoMetaData;
-import software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor;
 
 import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 class LambdaTracingAspectTest {
     private RequestHandler<Object, Object> requestHandler;
@@ -49,7 +49,7 @@ class LambdaTracingAspectTest {
 
     @BeforeEach
     void setUp() throws IllegalAccessException {
-        initMocks(this);
+        openMocks(this);
         writeStaticField(LambdaHandlerProcessor.class, "IS_COLD_START", null, true);
         setupContext();
         requestHandler = new PowerTracerToolEnabled();