chore: V2 update from main

CHANGELOG.md

@@ -8,6 +8,28 @@ This project follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) fo
 
 ## [Unreleased]
 
+## [1.17.0] - 2023-08-21
+
+### Added
+* Feat: Add Batch Processor module in (#1317) by @scottgerring 
+* Feat: Add SNS+SQS large messages module (#1310) by @jeromevdl
+
+### Maintenance
+* fix: use default credentials provider for all provided SDK clients in (#1303) by @roamingthings
+* Chore: Make request for Logger explicitly for current class in (#1307) by @jreijn 
+* Chore: checkstyle formater & linter in (#1316) by @jeromevdl
+* Chore: Add powertools specific user-agent-suffix to the AWS SDK v2 clients by @eldimi in (#1306)
+* Chore: Add 'v2' branch to build workflows to prepare for v2 work in (#1341) by @scottgerring 
+* Deps: Bump third party dependencies to the latest versions.
+
+### Documentation
+* Docs: Add maintainers guide in (#1326) by @scottgerring 
+* Docs: improve contributing guide in (#1334) by @jeromevdl
+* Docs: Improve example documentation in (#1291) by @scottgerring 
+* Docs: Add discord + sec disclosure links to readme in (#1311) by @scottgerring 
+* Docs: Add external examples from AWS SAM CLI App Templates in (#1318) by @AlexeySoshin 
+* Docs: Add CDK example in (#1321) by @AlexeySoshin
+
 ## [1.16.1] - 2023-07-19
 
 * Fix: idempotency timeout bug (#1285) by @scottgerring

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>1.16.1</version>
+        <version>1.17.0</version>
     </dependency>
     <dependency>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>powertools-logging</artifactId>
-        <version>1.16.1</version>
+        <version>1.17.0</version>
     </dependency>
     <dependency>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>powertools-metrics</artifactId>
-        <version>1.16.1</version>
+        <version>1.17.0</version>
     </dependency>
     ...
 </dependencies>

examples/.gitignore

@@ -1,2 +1,4 @@
 dependency-reduced-pom.xml
 .aws-sam
+cdk.out
+.m2

examples/README.md

@@ -5,7 +5,9 @@ Each example can be copied from its subdirectory and used independently of the r
 
 ## Examples
 
-* [powertools-examples-core](powertools-examples-core) - Demonstrates the core logging, tracing, and metrics modules 
+* [powertools-examples-core](powertools-examples-core) - Demonstrates the core logging, tracing, and metrics modules with different build tools 
+  * [SAM](./powertools-examples-core/sam) 
+  * [CDK](./powertools-examples-core/cdk)
 * [powertools-examples-idempotency](powertools-examples-idempotency) - An idempotent HTTP API
 * [powertools-examples-parameters](powertools-examples-parameters) - Uses the parameters module to provide runtime parameters to a function
 * [powertools-examples-serialization](powertools-examples-serialization) - Uses the serialization module to serialize and deserialize API Gateway & SQS payloads
@@ -34,8 +36,8 @@ amongst other things.
 To build and deploy an example application for the first time, run the following in your shell:
 
 ```bash
-# Switch to the directory containing an example for the powertools-core module
-$ cd powertools-examples-core
+# Switch to the directory containing an example for the powertools-idempotency module
+$ cd powertools-examples-idempotency
 
 # Build and deploy the example
 $ sam build
@@ -52,6 +54,8 @@ The first command will build the source of your application. The second command
 
 You can find your API Gateway Endpoint URL in the output values displayed after deployment.
 
+If you're not using SAM, you can look for examples for other tools under [powertools-examples-core](./powertools-examples-core)
+
 ### External examples
 
 You can find more examples in the https://github.com/aws/aws-sam-cli-app-templates project:

examples/pom.xml

@@ -29,7 +29,9 @@
     </description>
 
     <modules>
-        <module>powertools-examples-core</module>
+        <module>powertools-examples-core/sam</module>
+        <module>powertools-examples-core/cdk/app</module>
+        <module>powertools-examples-core/cdk/infra</module>
         <module>powertools-examples-idempotency</module>
         <module>powertools-examples-parameters</module>
         <module>powertools-examples-serialization</module>

examples/powertools-examples-batch/pom.xml

@@ -15,7 +15,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <sdk.version>2.20.109</sdk.version>
+        <sdk.version>2.20.128</sdk.version>
     </properties>
 
     <dependencies>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
@@ -107,18 +107,16 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                                </transformer>
+                                <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                             </transformers>
                         </configuration>
                     </execution>
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>com.github.edwgiz</groupId>
-                        <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                        <version>2.15</version>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                        <version>0.1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

examples/powertools-examples-batch/src/main/java/org/demo/batch/kinesis/KinesisBatchHandler.java

@@ -12,7 +12,7 @@
 
 public class KinesisBatchHandler implements RequestHandler<KinesisEvent, StreamsEventResponse> {
 
-    private final static Logger LOGGER = LogManager.getLogger(org.demo.batch.sqs.SqsBatchHandler.class);
+    private final static Logger LOGGER = LogManager.getLogger(KinesisBatchHandler.class);
     private final BatchMessageHandler<KinesisEvent, StreamsEventResponse> handler;
 
     public KinesisBatchHandler() {

examples/powertools-examples-cloudformation/pom.xml

@@ -14,9 +14,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <lambda.core.version>1.2.2</lambda.core.version>
+        <lambda.core.version>1.2.3</lambda.core.version>
         <lambda.events.version>3.11.2</lambda.events.version>
-        <aws.sdk.version>2.20.119</aws.sdk.version>
+        <aws.sdk.version>2.20.130</aws.sdk.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -132,18 +132,16 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
-                            </transformer>
+                            <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
                         </transformers>
                     </configuration>
                 </execution>
             </executions>
             <dependencies>
                 <dependency>
-                    <groupId>com.github.edwgiz</groupId>
-                    <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                    <version>2.15</version>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                    <version>0.1.0</version>
                 </dependency>
             </dependencies>
         </plugin>

examples/powertools-examples-core/README.md

@@ -5,17 +5,17 @@ This project demonstrates the Lambda for Powertools Java module - including
 [tracing](https://docs.powertools.aws.dev/lambda/java/core/tracing/), and
 [metrics](https://docs.powertools.aws.dev/lambda/java/core/metrics/).
 
-It is made up of the following:
+We provide examples for the following infrastructure-as-code tools:
+* [AWS SAM](sam/) 
+* [AWS CDK](cdk/)
 
-- [App.java](src/main/java/helloworld/App.java) - Code for the application's Lambda function.
-- [events](events) - Invocation events that you can use to invoke the function.
-- [AppTests.java](src/test/java/helloworld/AppTest.java) - Unit tests for the application code. 
-- [template.yaml](template.yaml) - A template that defines the application's AWS resources.
+For each of the tools, the example application is the same, and consists of the following files:
 
-## Deploy the sample application
+- [App.java](sam/src/main/java/helloworld/App.java) - Code for the application's Lambda function.
+- [AppTests.java](sam/src/test/java/helloworld/AppTest.java) - Unit tests for the application code.
+- [events](sam/events/event.json) - Invocation events that you can use to invoke the function.
 
-This sample is based on Serverless Application Model (SAM). To deploy it, check out the instructions for getting
-started with SAM in [the examples directory](../README.md)
+Configuration files and deployment process for each tool are described in corresponding README files.
 
 ## Test the application
 
@@ -35,13 +35,4 @@ different function calls within the example
 
 Likewise, from the CloudWatch dashboard, under **Metrics**, **all metrics**,  you will find the namespaces `Another`
 and `ServerlessAirline`. The values in each of these are published by the code in
-[App.java](src/main/java/helloworld/App.java). 
-
-You can also watch the trace information or log information using the SAM CLI:
-```bash
-# Tail the logs
-sam logs --tail $MY_STACK
-
-# Tail the traces
-sam traces --tail
-```
+[App.java](sam/src/main/java/helloworld/App.java). 

examples/powertools-examples-core/cdk/README.md

@@ -0,0 +1,36 @@
+#  Powertools for AWS Lambda (Java) - Core Utilities Example with CDK
+
+This project demonstrates the Lambda for Powertools Java module deployed using [Cloud Development Kit](https://aws.amazon.com/cdk/).
+
+For general information on the deployed example itself, you can refer to the parent [README](../README.md)
+
+## Configuration
+CDK uses the following project structure:
+- [app](./app) - stores the source code of your application, which is similar between all examples
+- [infra](./infra) - stores the definition of your infrastructure
+  - [cdk.json](./infra/cdk.json) - tells the CDK Toolkit how to execute your app
+  - [CdkApp](./infra/src/main/java/cdk/CdkApp.java) - bootstraps your stack, taking AWS `account` and `region` as input
+  - [CdkStack](./infra/src/main/java/cdk/CdkStack.java) - defines the Lambda function to be deployed as well as API Gateway for it.
+
+It is a [Maven](https://maven.apache.org/) based project, so you can open this project with any Maven compatible Java IDE to build and run tests.
+
+
+## Deploy the sample application
+
+The minimum to deploy the app should be
+```bash 
+cdk deploy
+```
+
+If you're running CDK for the first time, you'll need to first run the bootstrap command:
+```bash
+cdk bootstrap
+```
+
+## Useful commands
+
+* `mvn package`     compile and run tests
+* `cdk synth`       emits the synthesized CloudFormation template
+* `cdk deploy`      deploy this stack to your default AWS account/region
+* `cdk diff`        compare deployed stack with current state
+* `cdk docs`        open CDK documentation