merge conflict

Author: saragerion

Diff for: .github/workflows/on-merge-to-main.yml

@@ -61,7 +61,7 @@ jobs:
     # Generate documentation
     #########################
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
     - name: Install doc generation dependencies

Diff for: .github/workflows/on-release-prod.yml

@@ -66,7 +66,7 @@ jobs:
       # Generate documentation
       #########################
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: '3.8'
     - name: Set RELEASE_VERSION env var

Diff for: .github/workflows/pr_lint_and_test.yml

@@ -7,12 +7,16 @@ jobs:
     runs-on: ubuntu-latest
     env:
       NODE_ENV: dev
+    strategy:
+      matrix:
+        version: [12, 14, 16]
+      fail-fast: false
     steps:
       - uses: actions/checkout@v3
-      - name: "Use NodeJS 16"
+      - name: "Use NodeJS"
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: ${{ matrix.version }}
       - name: Install [email protected]
         run: npm i -g npm@next-8
       - name: "Setup npm"
@@ -61,3 +65,10 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           lcov-file: ./coverage/lcov.info
+      - name: Packages size report
+        uses: flochaz/[email protected]
+        with:
+          build-command: mkdir dist && npm run lerna-package && npm run lerna-package-bundle && bash -c "mv ./packages/*/dist/* dist/" && ls dist
+          dist-directory: /dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/run-e2e-tests.yml

@@ -49,13 +49,14 @@ jobs:
       matrix:
         package: [logger, metrics, tracer]
         version: [12, 14, 16]
+      fail-fast: false
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3
-      - name: "Use NodeJS 16"
+      - name: "Use NodeJS"
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: ${{ matrix.version }}
       - name: "Install [email protected]"
         run: npm i -g npm@next-8
       - name: "Install monorepo packages"

Diff for: CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.10.0](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.9.1...v0.10.0) (2022-06-02)
+
+
+### Bug Fixes
+
+* **commons:** rename tests subfolder to samples to avoid being deleted by tools such as node-prune ([#882](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/882)) ([74ef816](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/74ef816830eca897d59881b1d260a146a2c9a47c))
+
+
+### Features
+
+* **all:** nodejs16x support ([#877](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/877)) ([d2b13c9](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/d2b13c945adb1a74b7c5f76d45f28a6979ce6429))
+* **logger:** add removeKeys functionality ([#901](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/901)) ([a0f72c2](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/a0f72c275270db33d382bff357f6054f552197e6))
+
+
+
+
+
 ## [0.9.1](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.9.0...v0.9.1) (2022-05-24)
 
 

Diff for: CONTRIBUTING.md

@@ -78,11 +78,7 @@ First, [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) the
 ```console
 git clone https://github.com/{your-account}/aws-lambda-powertools-typescript.git
 cd aws-lambda-powertools-typescript
-npm ci --foreground-scripts;
-cd examples/cdk; npm ci
-cd ../..
-cd examples/sam; npm ci
-npm run init-environment
+npm run setup-local
 ```
 
 We recommend that you use [Visual Studio Code](https://code.visualstudio.com/) to work on the repo.

Diff for: README.md

@@ -45,9 +45,6 @@ Each TypeScript utility is installed as standalone NPM package.
 
 * [CDK](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/cdk)
 * [SAM](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/sam)
-* [Tracer](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/cdk/src)
-* [Logger](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/packages/logger/examples)
-* [Metrics](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/packages/metrics/examples)
 
 ## Credits
 

Diff for: docs/core/logger.md

@@ -200,9 +200,12 @@ You can append additional persistent keys and values in the logs generated durin
 * Via the Logger's `appendKeys` method, for all log items generated after calling this method
 * Passing them in the Logger's constructor
 
+To remove the keys you added, you can use the `removeKeys` method.
+
+
 === "handler.ts"
 
-    ```typescript hl_lines="5-12 16-23"
+    ```typescript hl_lines="5-13 17-25 30"
     import { Logger } from '@aws-lambda-powertools/logger';
 
     // Add persistent log keys via the constructor
@@ -213,7 +216,8 @@ You can append additional persistent keys and values in the logs generated durin
             logger: {
                 name: '@aws-lambda-powertools/logger',
                 version: '0.0.1',
-            }
+            },
+            extra_key: "some-value"
         }
     });
 
@@ -224,10 +228,14 @@ You can append additional persistent keys and values in the logs generated durin
     //     logger: {
     //         name: '@aws-lambda-powertools/logger',
     //         version: '0.0.1',
-    //     }
+    //     },
+    //     extra_key: "some-value"
     // });    
 
     export const handler = async (_event: any, _context: any): Promise<unknown> => {
+
+        // If you don't want to log the "extra_key" attribute in your logs, you can remove it
+        logger.removeKeys(["extra_key"])
 
         // This info log will print all extra custom attributes added above
         // Extra attributes: logger object with name and version of the logger library, awsAccountId, awsRegion
@@ -271,6 +279,7 @@ You can append additional persistent keys and values in the logs generated durin
     }
     ```
 
+
 !!! tip "Logger will automatically ignore any key with an `undefined` value"
 
 #### Clearing all state

Diff for: docs/index.md

@@ -64,9 +64,6 @@ Each TypeScript utility is installed as standalone NPM package.
 
 * [CDK](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/cdk){target="_blank"}
 * [SAM](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/sam){target="_blank"}
-* [Tracer](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/examples/cdk/lib){target="_blank"}
-* [Logger](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/packages/logger/examples){target="_blank"}
-* [Metrics](https://github.com/awslabs/aws-lambda-powertools-typescript/tree/main/packages/metrics/examples){target="_blank"}
 
 ## Credits
 

Diff for: docs/requirements.txt

@@ -1,3 +1,3 @@
 mike==1.1.2
-mkdocs-material==8.2.15
+mkdocs-material==8.3.6
 mkdocs-git-revision-date-plugin==0.3.2

Diff for: examples/cdk/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.10.0](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.9.1...v0.10.0) (2022-06-02)
+
+
+### Features
+
+* **all:** nodejs16x support ([#877](https://github.com/awslabs/aws-lambda-powertools-typescript/issues/877)) ([d2b13c9](https://github.com/awslabs/aws-lambda-powertools-typescript/commit/d2b13c945adb1a74b7c5f76d45f28a6979ce6429))
+
+
+
+
+
 ## [0.9.1](https://github.com/awslabs/aws-lambda-powertools-typescript/compare/v0.9.0...v0.9.1) (2022-05-24)
 
 **Note:** Version bump only for package cdk-app