Change SLF4J logger to context logger, update dependencies accordingly

yualexan · yualexan · commit 54f81e324e69 · 2024-05-07T15:57:05.000-07:00
Tested changes on both Gradle and Maven, works well
diff --git a/sample-apps/s3-java/build.gradle b/sample-apps/s3-java/build.gradle
@@ -7,18 +7,15 @@ repositories {
 }
 
 dependencies {
-    implementation platform('software.amazon.awssdk:bom:2.15.0')
+    implementation platform('software.amazon.awssdk:bom:2.16.1')
     implementation platform('com.amazonaws:aws-xray-recorder-sdk-bom:2.11.0')
     implementation 'software.amazon.awssdk:s3'
     implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
     implementation 'com.amazonaws:aws-lambda-java-events:3.11.0'
-    implementation 'org.apache.logging.log4j:log4j-api:[2.17.1,)'
-    implementation 'org.apache.logging.log4j:log4j-core:[2.17.1,)'
-    implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:[2.17.1,)'
-    runtimeOnly 'com.amazonaws:aws-lambda-java-log4j2:1.5.1'
     implementation 'com.amazonaws:aws-xray-recorder-sdk-core'
     implementation 'com.amazonaws:aws-xray-recorder-sdk-aws-sdk'
-    implementation 'com.amazonaws:aws-xray-recorder-sdk-aws-sdk-instrumentor'
+    implementation 'com.amazonaws:aws-xray-recorder-sdk-aws-sdk-v2-instrumentor'
+    implementation 'org.slf4j:slf4j-nop:2.0.6'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }
@@ -35,8 +32,8 @@ task packageJar(type: Zip) {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 build.dependsOn packageJar
diff --git a/sample-apps/s3-java/pom.xml b/sample-apps/s3-java/pom.xml
@@ -8,8 +8,8 @@
   <name>s3-java-function</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
   </properties>
 
   <dependencyManagement>
@@ -46,26 +46,6 @@
       <artifactId>aws-lambda-java-events</artifactId>
       <version>3.11.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-lambda-java-log4j2</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <version>[2.17.1,)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>[2.17.1,)</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j18-impl</artifactId>
-      <version>[2.17.1,)</version>
-    </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-xray-recorder-sdk-core</artifactId>
@@ -76,7 +56,12 @@
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
-      <artifactId>aws-xray-recorder-sdk-aws-sdk-instrumentor</artifactId>
+      <artifactId>aws-xray-recorder-sdk-aws-sdk-v2-instrumentor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>2.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -101,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.5.2</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
         </configuration>
@@ -111,29 +96,17 @@
             <goals>
               <goal>shade</goal>
             </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                </transformer>
-              </transformers>
-            </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.github.edwgiz</groupId>
-            <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-            <version>[2.17.1,)</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.13.0</version>
         <configuration>
-           <source>1.8</source>
-           <target>1.8</target>
+          <source>21</source>
+          <target>21</target>
+          <release>21</release>
         </configuration>
       </plugin>
     </plugins>
diff --git a/sample-apps/s3-java/src/main/java/example/Handler.java b/sample-apps/s3-java/src/main/java/example/Handler.java
@@ -21,16 +21,13 @@
 import software.amazon.awssdk.services.s3.S3Client;
 
 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.S3Event;
 import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification.S3EventNotificationRecord;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 // Handler value: example.Handler
 public class Handler implements RequestHandler<S3Event, String> {
-  private static final Logger logger = LoggerFactory.getLogger(Handler.class);
   private static final float MAX_DIMENSION = 100;
   private final String REGEX = ".*\\.([^\\.]*)";
   private final String JPG_TYPE = "jpg";
@@ -39,6 +36,7 @@ public class Handler implements RequestHandler<S3Event, String> {
   private final String PNG_MIME = "image/png";
   @Override
   public String handleRequest(S3Event s3event, Context context) {
+    LambdaLogger logger = context.getLogger();
     try {
       S3EventNotificationRecord record = s3event.getRecords().get(0);
       
@@ -53,12 +51,12 @@ public String handleRequest(S3Event s3event, Context context) {
       // Infer the image type.
       Matcher matcher = Pattern.compile(REGEX).matcher(srcKey);
       if (!matcher.matches()) {
-          logger.info("Unable to infer image type for key " + srcKey);
+          logger.log("Unable to infer image type for key " + srcKey);
           return "";
       }
       String imageType = matcher.group(1);
       if (!(JPG_TYPE.equals(imageType)) && !(PNG_TYPE.equals(imageType))) {
-          logger.info("Skipping non-image " + srcKey);
+          logger.log("Skipping non-image " + srcKey);
           return "";
       }
 
@@ -75,9 +73,9 @@ public String handleRequest(S3Event s3event, Context context) {
       ImageIO.write(newImage, imageType, outputStream);
 
       // Upload new image to S3
-      putObject(s3Client, outputStream, dstBucket, dstKey, imageType);
+      putObject(s3Client, outputStream, dstBucket, dstKey, imageType, logger);
 
-      logger.info("Successfully resized " + srcBucket + "/"
+      logger.log("Successfully resized " + srcBucket + "/"
               + srcKey + " and uploaded to " + dstBucket + "/" + dstKey);
       return "Ok";
     } catch (IOException e) {
@@ -94,7 +92,7 @@ private InputStream getObject(S3Client s3Client, String bucket, String key) {
   }
 
   private void putObject(S3Client s3Client, ByteArrayOutputStream outputStream,
-    String bucket, String key, String imageType) {
+    String bucket, String key, String imageType, LambdaLogger logger) {
       Map<String, String> metadata = new HashMap<>();
       metadata.put("Content-Length", Integer.toString(outputStream.size()));
       if (JPG_TYPE.equals(imageType)) {
@@ -110,14 +108,14 @@ private void putObject(S3Client s3Client, ByteArrayOutputStream outputStream,
         .build();
 
       // Uploading to S3 destination bucket
-      logger.info("Writing to: " + bucket + "/" + key);
+      logger.log("Writing to: " + bucket + "/" + key);
       try {
         s3Client.putObject(putObjectRequest,
           RequestBody.fromBytes(outputStream.toByteArray()));
       }
       catch(AwsServiceException e)
       {
-        logger.error(e.awsErrorDetails().errorMessage());
+        logger.log(e.awsErrorDetails().errorMessage());
         System.exit(1);
       }
   }
diff --git a/sample-apps/s3-java/template-mvn.yml b/sample-apps/s3-java/template-mvn.yml
@@ -10,7 +10,7 @@ Resources:
     Properties:
       CodeUri: target/s3-java-1.0-SNAPSHOT.jar
       Handler: example.Handler::handleRequest
-      Runtime: java8
+      Runtime: java21
       Description: Java function
       MemorySize: 512
       Timeout: 30
