Merge branch 'main' into dependabot/github_actions/github/codeql-action-4.30.7

Author: svozza

examples/snippets/package.json

@@ -41,7 +41,7 @@
     "@aws-sdk/util-dynamodb": "^3.902.0",
     "@middy/core": "^4.7.0",
     "@redis/client": "^5.8.3",
-    "@valkey/valkey-glide": "^2.1.0",
+    "@valkey/valkey-glide": "^2.1.1",
     "aws-sdk": "^2.1692.0",
     "aws-sdk-client-mock": "^4.1.0",
     "zod": "^4.1.12"

package-lock.json

@@ -1291,7 +1291,12 @@ class Logger extends Utility implements LoggerInterface {
       correlationIdSearchFn,
     } = options;
 
-    if (persistentLogAttributes && persistentKeys) {
+    if (
+      persistentLogAttributes &&
+      Object.keys(persistentLogAttributes).length > 0 &&
+      persistentKeys &&
+      Object.keys(persistentKeys).length > 0
+    ) {
       this.warn(
         'Both persistentLogAttributes and persistentKeys options were provided. Using persistentKeys as persistentLogAttributes is deprecated and will be removed in future releases'
       );

packages/logger/src/Logger.ts

@@ -622,6 +622,15 @@ describe('Working with keys', () => {
     );
   });
 
+  it('should pass persistentKeys to child with no warning', () => {
+    // Prepare
+    const logger = new Logger();
+    logger.createChild({ persistentKeys: { abc: 'xyz' } });
+
+    // Assess
+    expect(console.warn).toHaveBeenCalledTimes(0);
+  });
+
   it("doesn't overwrite standard keys when appending keys", () => {
     // Prepare
     const logger = new Logger();