fix(lambda): configuring log retention fails on 70+ Lambdas (#31340)

When the Log Retention Lambda runs massively parallel (on 70+ Lambdas at the same time), it can run into throttling problems and fail. Raise the retry count and delays: - Raise the default amount of retries from 5 -> 10 - Raise the sleep base from 100ms to 1s. - Change the sleep calculation to apply the 60s limit *after* jitter instead of before (previously, we would take a fraction of 60s; now we're taking a fraction of the accumulated wait time, and after calculating that limit it to 60s). Fixes #31338. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Sep 25, 2024 · a2d42d2 · a2d42d2
1 parent c9709d4
commit a2d42d2
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 35 deletions.
diff --git a/...-retention.js.snapshot/LambdaLogRetentionIntegDefaultTestDeployAssert90E53934.assets.json b/...-retention.js.snapshot/LambdaLogRetentionIntegDefaultTestDeployAssert90E53934.assets.json
diff --git a/....snapshot/asset.c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f/index.js b/....snapshot/asset.c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f/index.js
diff --git a/....snapshot/asset.e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035/index.js b/....snapshot/asset.e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035/index.js
diff --git a/.../aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.assets.json b/.../aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.assets.json
diff --git a/...ws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json b/...ws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json
@@ -146,7 +146,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035.zip"
+     "S3Key": "c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f.zip"
     },
     "Role": {
      "Fn::GetAtt": [

diff --git a/...-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/cdk.out b/...-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/cdk.out
diff --git a/...k-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/integ.json b/...k-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/integ.json
diff --git a/...esting/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/manifest.json b/...esting/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/manifest.json
diff --git a/...eg.log-retention.js.snapshot/LogRetentionIntegDefaultTestDeployAssert6ACC5A74.assets.json b/...eg.log-retention.js.snapshot/LogRetentionIntegDefaultTestDeployAssert6ACC5A74.assets.json
diff --git a/....snapshot/asset.c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f/index.js b/....snapshot/asset.c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f/index.js
diff --git a/....snapshot/asset.e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035/index.js b/....snapshot/asset.e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035/index.js
diff --git a/...est/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.assets.json b/...est/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.assets.json
diff --git a/...t/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json b/...t/aws-logs/test/integ.log-retention.js.snapshot/aws-cdk-log-retention-integ.template.json
@@ -133,7 +133,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035.zip"
+     "S3Key": "c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f.zip"
     },
     "Role": {
      "Fn::GetAtt": [

diff --git a/...ws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/cdk.out
diff --git a/...cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/integ.json
diff --git a/...-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-logs/test/integ.log-retention.js.snapshot/manifest.json