Merge branch 'main' into support_crac_on_powertools_metrics

Author: subhash686

.github/workflows/security-scorecard.yml

@@ -52,6 +52,6 @@ jobs:
           path: results.sarif
           retention-days: 5
       - name: Upload to Code-Scanning
-        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

README.md

@@ -22,17 +22,17 @@ Powertools for AWS Lambda (Java) is available in Maven Central. You can use your
     <dependency>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>powertools-tracing</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </dependency>
     <dependency>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>powertools-logging</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </dependency>
     <dependency>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>powertools-metrics</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.1</version>
     </dependency>
     ...
 </dependencies>

docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM squidfunk/mkdocs-material@sha256:0bfdba448e93984191246f7a28abeacc79f789e7e9cf0c639a48fe4365e880a7
+FROM squidfunk/mkdocs-material@sha256:bb7b015690d9fb5ef0dbc98ca3520f153aa43129fb96aec5ca54c9154dc3b729
 
 COPY requirements.txt /tmp/
 RUN pip install --require-hashes -r /tmp/requirements.txt

examples/pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>software.amazon.lambda</groupId>
     <artifactId>powertools-examples</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <packaging>pom</packaging>
 
     <name>Powertools for AWS Lambda (Java) - Examples</name>

examples/powertools-examples-batch/deploy/sqs/template.yml

@@ -65,6 +65,7 @@ Resources:
   DemoSQSSenderFunction:
     Type: AWS::Serverless::Function
     Properties:
+      Tracing: Active
       CodeUri: ../..
       Handler: org.demo.batch.sqs.SqsBatchSender::handleRequest
       Environment:
@@ -173,7 +174,6 @@ Resources:
               Action:
                 - s3:PutObject
               Resource: !Sub ${Bucket.Arn}/*
-
       Events:
         MySQSEvent:
           Type: SQS

examples/powertools-examples-batch/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>software.amazon.lambda.examples</groupId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <artifactId>powertools-examples-batch</artifactId>
     <packaging>jar</packaging>
     <name>Powertools for AWS Lambda (Java) - Examples - Batch</name>
@@ -14,7 +14,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <aspectj.version>1.9.20.1</aspectj.version>
-        <sdk.version>2.31.78</sdk.version>
+        <sdk.version>2.32.6</sdk.version>
     </properties>
 
     <dependencies>

examples/powertools-examples-batch/src/main/java/org/demo/batch/sqs/AbstractSqsBatchHandler.java

@@ -14,21 +14,22 @@
 
 package org.demo.batch.sqs;
 
-import com.amazonaws.services.lambda.runtime.Context;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Random;
+
 import org.demo.batch.model.Product;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.lambda.powertools.logging.Logging;
 import software.amazon.lambda.powertools.tracing.Tracing;
 import software.amazon.lambda.powertools.tracing.TracingUtils;
 
@@ -43,23 +44,23 @@ public class AbstractSqsBatchHandler {
      * Simulate some processing (I/O + S3 put request)
      * @param p deserialized product
      */
-    @Logging
     @Tracing
     protected void processMessage(Product p) {
         TracingUtils.putAnnotation("productId", p.getId());
         TracingUtils.putAnnotation("Thread", Thread.currentThread().getName());
         MDC.put("product", String.valueOf(p.getId()));
         LOGGER.info("Processing product {}", p);
 
-        char c = (char)(r.nextInt(26) + 'a');
+        char c = (char) (r.nextInt(26) + 'a');
         char[] chars = new char[1024 * 1000];
         Arrays.fill(chars, c);
         p.setName(new String(chars));
         try {
-            File file = new File("/tmp/"+p.getId()+".json");
+            File file = new File("/tmp/" + p.getId() + ".json");
             mapper.writeValue(file, p);
             s3.putObject(
-                    PutObjectRequest.builder().bucket(bucket).key(p.getId()+".json").build(), RequestBody.fromFile(file));
+                    PutObjectRequest.builder().bucket(bucket).key(p.getId() + ".json").build(),
+                    RequestBody.fromFile(file));
         } catch (IOException e) {
             throw new RuntimeException(e);
         } finally {

examples/powertools-examples-cloudformation/README.md

@@ -15,7 +15,7 @@ Run the following in your shell:
 ```bash
 cd infra/sam
 sam build
-sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-20230718
+sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.2.1718
 ```
 
 ### Deploy with CDK
@@ -32,5 +32,5 @@ To build and deploy this application for the first time, run the following in yo
 cd infra/cdk
 mvn package
 cdk synth
-cdk deploy -c BucketNameParam=my-unique-bucket-20230718
+cdk deploy -c BucketNameParam=my-unique-bucket-2.2.1718
 ```

examples/powertools-examples-cloudformation/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>software.amazon.lambda.examples</groupId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <artifactId>powertools-examples-cloudformation</artifactId>
     <packaging>jar</packaging>
 
@@ -13,7 +13,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <lambda.core.version>1.3.0</lambda.core.version>
-        <lambda.events.version>3.16.0</lambda.events.version>
+        <lambda.events.version>3.16.1</lambda.events.version>
         <aws.sdk.version>2.32.5</aws.sdk.version>
         <aspectj.version>1.9.20.1</aspectj.version>
 

examples/powertools-examples-core-utilities/cdk/app/pom.xml

@@ -6,7 +6,7 @@
     <groupId>software.amazon.lambda.examples</groupId>
     <!-- TODO TODO TODO this should build from SNAPSHOT, but it doesn't, because the snapshots
     don't appear in the docker environment CDK builds it in in our CDK tests. How to procede? V2 blocker -->
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <artifactId>powertools-examples-core-utilities-cdk</artifactId>
     <packaging>jar</packaging>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.16.0</version>
+            <version>3.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>