Update logging for java-events examples

- Use Context logger in all handlers, removing SLF4J dependency
- Unit testing still requires SLF4J logging
- Included missing CloudFront option in 3-invoke.sh script
- Manually deployed and tested all handlers; all work as normal

Author: yualexan

sample-apps/java-events/3-invoke.sh

@@ -16,6 +16,9 @@ then
     sns)
       PAYLOAD='file://events/sns-notification.json'
       ;;
+    cdn)
+      PAYLOAD='file://events/cloudfront.json'
+      ;;
     cfg)
       PAYLOAD='file://events/config-rule.json'
       ;;

sample-apps/java-events/build.gradle

@@ -9,11 +9,11 @@ repositories {
 dependencies {
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
     implementation 'com.amazonaws:aws-lambda-java-events:3.11.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:[2.17.1,)'
+    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.slf4j:slf4j-nop:2.0.6'
     testImplementation 'com.amazonaws:aws-lambda-java-tests:1.1.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 test {

sample-apps/java-events/pom.xml

@@ -28,9 +28,9 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j18-impl</artifactId>
-      <version>[2.17.1,)</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

sample-apps/java-events/src/main/java/example/HandlerApiGatewayV1.java

@@ -1,24 +1,21 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
 import java.util.HashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.Handler
 public class HandlerApiGatewayV1 implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerApiGatewayV1.class);
-
   @Override
   public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent();
     response.setIsBase64Encoded(false);
     response.setStatusCode(200);

sample-apps/java-events/src/main/java/example/HandlerApiGatewayV2.java

@@ -1,24 +1,21 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
 
 import java.util.HashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerApiGateway
 public class HandlerApiGatewayV2 implements RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTPResponse>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerApiGatewayV2.class);
-
   @Override
   public APIGatewayV2HTTPResponse handleRequest(APIGatewayV2HTTPEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     APIGatewayV2HTTPResponse response = new APIGatewayV2HTTPResponse();
     response.setIsBase64Encoded(false);
     response.setStatusCode(200);

sample-apps/java-events/src/main/java/example/HandlerCWEvents.java

@@ -1,24 +1,21 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.ScheduledEvent;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerCWEvents
 public class HandlerCWEvents implements RequestHandler<ScheduledEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerCWEvents.class);
-
   @Override
   public List<String> handleRequest(ScheduledEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var resourcesFound = new ArrayList<String>();
     for (String resource : event.getResources()) {
       resourcesFound.add(resource);

sample-apps/java-events/src/main/java/example/HandlerCWLogs.java

@@ -1,6 +1,7 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.CloudWatchLogsEvent;
 
@@ -14,18 +15,14 @@
 import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerCWLogs
 public class HandlerCWLogs implements RequestHandler<CloudWatchLogsEvent, String>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerCWLogs.class);
-
   @Override
   public String handleRequest(CloudWatchLogsEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     Decoder decoder = Base64.getDecoder();
     byte[] decodedEvent = decoder.decode(event.getAwsLogs().getData());
     StringBuilder output = new StringBuilder();
@@ -38,7 +35,7 @@ public String handleRequest(CloudWatchLogsEvent event, Context context)
       });
       // logger.info(output.toString());
     } catch(IOException e) {
-        logger.error("ERROR: " + e.toString());
+        logger.log("ERROR: " + e.toString());
     }
     return output.toString();
   }

sample-apps/java-events/src/main/java/example/HandlerCloudFront.java

@@ -1,6 +1,7 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.CloudFrontEvent;
 import com.amazonaws.services.lambda.runtime.events.CloudFrontEvent.CF;
@@ -9,18 +10,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerCloudFront
 public class HandlerCloudFront implements RequestHandler<CloudFrontEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerCloudFront.class);
-
   @Override
   public List<String> handleRequest(CloudFrontEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var urisFound = new ArrayList<String>();
     for (Record record : event.getRecords()) {
       CF cfBody = record.getCf();

sample-apps/java-events/src/main/java/example/HandlerCodeCommit.java

@@ -1,6 +1,7 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent;
 import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent.CodeCommit;
@@ -10,18 +11,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerCodeCommit
 public class HandlerCodeCommit implements RequestHandler<CodeCommitEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerCodeCommit.class);
-
   @Override
   public List<String> handleRequest(CodeCommitEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var commitsFound = new ArrayList<String>();
     for (Record record : event.getRecords()) {
       CodeCommit commit = record.getCodeCommit();

sample-apps/java-events/src/main/java/example/HandlerCognito.java

@@ -1,25 +1,22 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.CognitoEvent;
 import com.amazonaws.services.lambda.runtime.events.CognitoEvent.DatasetRecord;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerCognito
 public class HandlerCognito implements RequestHandler<CognitoEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerCognito.class);
-
   @Override
   public List<String> handleRequest(CognitoEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var operationsFound = new ArrayList<String>();
     for (DatasetRecord record : event.getDatasetRecords().values()) {
       operationsFound.add(record.getOp());

sample-apps/java-events/src/main/java/example/HandlerConfig.java

@@ -1,21 +1,18 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.ConfigEvent;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerConfig
 public class HandlerConfig implements RequestHandler<ConfigEvent, String>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerConfig.class);
-
   @Override
   public String handleRequest(ConfigEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     return event.getConfigRuleArn();
   }
 }

sample-apps/java-events/src/main/java/example/HandlerDynamoDB.java

@@ -1,25 +1,22 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent.DynamodbStreamRecord;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerDynamoDB
 public class HandlerDynamoDB implements RequestHandler<DynamodbEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerDynamoDB.class);
-
   @Override
   public List<String> handleRequest(DynamodbEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var operationsFound = new ArrayList<String>();
     for (DynamodbStreamRecord record : event.getRecords()) {
       operationsFound.add(record.getEventName());

sample-apps/java-events/src/main/java/example/HandlerFirehose.java

@@ -1,25 +1,22 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.KinesisFirehoseEvent;
 import com.amazonaws.services.lambda.runtime.events.KinesisFirehoseEvent.Record;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerFirehose
 public class HandlerFirehose implements RequestHandler<KinesisFirehoseEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerFirehose.class);
-
   @Override
   public List<String> handleRequest(KinesisFirehoseEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var recordIds = new ArrayList<String>();
     for (Record record : event.getRecords()) {
       recordIds.add(record.getRecordId());

sample-apps/java-events/src/main/java/example/HandlerKinesis.java

@@ -1,6 +1,7 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent.KinesisEventRecord;
@@ -11,19 +12,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandleKinesis
 public class HandlerKinesis implements RequestHandler<KinesisEvent, List<String>>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerKinesis.class);
   Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
   @Override
   public List<String> handleRequest(KinesisEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     var dataRecords = new ArrayList<String>();
     for(KinesisEventRecord record : event.getRecords()) {
       dataRecords.add(gson.toJson(record.getKinesis().getData()));

sample-apps/java-events/src/main/java/example/HandlerLex.java

@@ -1,21 +1,18 @@
 package example;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.LexEvent;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.HandlerLex
 public class HandlerLex implements RequestHandler<LexEvent, String>{
 
-  private static final Logger logger = LoggerFactory.getLogger(HandlerLex.class);
-
   @Override
   public String handleRequest(LexEvent event, Context context)
   {
-    logger.info("EVENT TYPE: " + event.getClass().toString());
+    LambdaLogger logger = context.getLogger();
+    logger.log("EVENT TYPE: " + event.getClass().toString());
     return event.getCurrentIntent().getName();
   }
 }