From 4dce7643b467556ad97f7565814ec5343c2796fd Mon Sep 17 00:00:00 2001
From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com>
Date: Thu, 9 Nov 2023 10:33:34 -0800
Subject: [PATCH] chore(cdk): update ADOT Lambda Layer ARNs  (#27849)

Update ADOT Lambda Layer ARNs of latest release.

References -

- https://github.com/aws-otel/aws-otel.github.io/pull/665
- https://github.com/aws-observability/aws-otel-lambda/pull/763
- https://github.com/aws-observability/aws-otel-lambda/pull/762

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../Stack1.assets.json                        |   4 +-
 .../Stack1.template.json                      | 233 +++---------
 .../Stack2.assets.json                        |   4 +-
 .../Stack2.template.json                      | 233 +++---------
 .../manifest.json                             |  16 +-
 .../integ.lambda-adot.js.snapshot/tree.json   | 166 +++++----
 .../test/aws-lambda/test/integ.lambda-adot.ts |  10 +-
 .../aws-cdk-lib/aws-lambda/lib/adot-layers.ts |  35 +-
 .../aws-cdk-lib/aws-lambda/test/adot.test.ts  |  27 +-
 .../aws-lambda/test/function.test.ts          |  12 +-
 .../region-info/build-tools/fact-tables.ts    | 331 +++++++++++++++++-
 11 files changed, 572 insertions(+), 499 deletions(-)

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
index 09e3097c8c1a1..ab5cc895e502e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
@@ -1,7 +1,7 @@
 {
   "version": "34.0.0",
   "files": {
-    "09e175cc660d94fff052a12aace2078eda6689da88fd89ccf203b417ccb951e4": {
+    "75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed": {
       "source": {
         "path": "Stack1.template.json",
         "packaging": "file"
@@ -9,7 +9,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "09e175cc660d94fff052a12aace2078eda6689da88fd89ccf203b417ccb951e4.json",
+          "objectKey": "75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
index f1ebef5bc1b44..4a1fc9fb25200 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
@@ -72,12 +72,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVASCRIPTxSDKx1x16x0xarm64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1"
+       ]
       ]
      }
     ],
@@ -166,12 +169,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "PYTHONxSDKx1x20x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+       ]
       ]
      }
     ],
@@ -260,12 +266,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxSDKx1x30x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -354,12 +363,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -448,12 +460,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "GENERICx0x84x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+       ]
       ]
      }
     ],
@@ -474,164 +489,6 @@
    ]
   }
  },
- "Mappings": {
-  "AdotlambdalayerMap": {
-   "af-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-northeast-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-northeast-2": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-southeast-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-southeast-2": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ca-central-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "cn-north-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "cn-northwest-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-central-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-north-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-2": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-3": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "me-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "sa-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-east-2": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-west-1": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-west-2": {
-    "JAVASCRIPTxSDKx1x16x0xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
index dcd29dc8ce6de..51b95077e58b4 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
@@ -1,7 +1,7 @@
 {
   "version": "34.0.0",
   "files": {
-    "9f515fedf55b94cfbfb76ba9205af76d296f2291c191fd0a938530221daff238": {
+    "0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6": {
       "source": {
         "path": "Stack2.template.json",
         "packaging": "file"
@@ -9,7 +9,7 @@
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "9f515fedf55b94cfbfb76ba9205af76d296f2291c191fd0a938530221daff238.json",
+          "objectKey": "0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
index 5dacb352c8a7b..3a6b00dffb107 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
@@ -72,12 +72,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVASCRIPTxSDKx1x16x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1"
+       ]
       ]
      }
     ],
@@ -166,12 +169,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "PYTHONxSDKx1x20x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+       ]
       ]
      }
     ],
@@ -260,12 +266,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxSDKx1x30x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -354,12 +363,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+       ]
       ]
      }
     ],
@@ -448,12 +460,15 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "GENERICx0x84x0xx86x64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+       ]
       ]
      }
     ],
@@ -474,164 +489,6 @@
    ]
   }
  },
- "Mappings": {
-  "AdotlambdalayerMap": {
-   "af-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-northeast-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-northeast-2": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-southeast-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ap-southeast-2": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "ca-central-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "cn-north-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "cn-northwest-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-central-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-north-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-2": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "eu-west-3": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "me-south-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "sa-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-east-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-east-2": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-west-1": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   },
-   "us-west-2": {
-    "JAVASCRIPTxSDKx1x16x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2",
-    "PYTHONxSDKx1x20x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2",
-    "JAVAxSDKx1x30x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1",
-    "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1",
-    "GENERICx0x84x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1"
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
index 6e6744e50251d..b586de7a08483 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
@@ -18,7 +18,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/09e175cc660d94fff052a12aace2078eda6689da88fd89ccf203b417ccb951e4.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/75e2bf084797f71f99ed5cb6f35bb6f1ee8a42cbbdb4ccd99008c5792941bbed.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -52,12 +52,6 @@
             "data": "MyFunc11BE70A62"
           }
         ],
-        "/Stack1/Adot-lambda-layerMap": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "AdotlambdalayerMap"
-          }
-        ],
         "/Stack1/MyFunc2/ServiceRole/Resource": [
           {
             "type": "aws:cdk:logicalId",
@@ -162,7 +156,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9f515fedf55b94cfbfb76ba9205af76d296f2291c191fd0a938530221daff238.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0a53257b39135563c9bc8a0266ed700fb15d8858f13e44c476dbfd549668a4c6.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -196,12 +190,6 @@
             "data": "MyFunc11BE70A62"
           }
         ],
-        "/Stack2/Adot-lambda-layerMap": [
-          {
-            "type": "aws:cdk:logicalId",
-            "data": "AdotlambdalayerMap"
-          }
-        ],
         "/Stack2/MyFunc2/ServiceRole/Resource": [
           {
             "type": "aws:cdk:logicalId",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
index 85ffc99ac7d92..62bd8473a9778 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
@@ -131,12 +131,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVASCRIPTxSDKx1x16x0xarm64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1"
+                          ]
                         ]
                       }
                     ],
@@ -171,14 +174,6 @@
               "version": "0.0.0"
             }
           },
-          "Adot-lambda-layerMap": {
-            "id": "Adot-lambda-layerMap",
-            "path": "Stack1/Adot-lambda-layerMap",
-            "constructInfo": {
-              "fqn": "aws-cdk-lib.CfnMapping",
-              "version": "0.0.0"
-            }
-          },
           "MyFunc2": {
             "id": "MyFunc2",
             "path": "Stack1/MyFunc2",
@@ -299,12 +294,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "PYTHONxSDKx1x20x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+                          ]
                         ]
                       }
                     ],
@@ -459,12 +457,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxSDKx1x30x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -619,12 +620,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -779,12 +783,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "GENERICx0x84x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -968,12 +975,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVASCRIPTxSDKx1x16x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1"
+                          ]
                         ]
                       }
                     ],
@@ -1008,14 +1018,6 @@
               "version": "0.0.0"
             }
           },
-          "Adot-lambda-layerMap": {
-            "id": "Adot-lambda-layerMap",
-            "path": "Stack2/Adot-lambda-layerMap",
-            "constructInfo": {
-              "fqn": "aws-cdk-lib.CfnMapping",
-              "version": "0.0.0"
-            }
-          },
           "MyFunc2": {
             "id": "MyFunc2",
             "path": "Stack2/MyFunc2",
@@ -1136,12 +1138,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "PYTHONxSDKx1x20x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3"
+                          ]
                         ]
                       }
                     ],
@@ -1296,12 +1301,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxSDKx1x30x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -1456,12 +1464,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "JAVAxAUTOxINSTRUMENTATIONx1x30x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1"
+                          ]
                         ]
                       }
                     ],
@@ -1616,12 +1627,15 @@
                     "handler": "index.handler",
                     "layers": [
                       {
-                        "Fn::FindInMap": [
-                          "AdotlambdalayerMap",
-                          {
-                            "Ref": "AWS::Region"
-                          },
-                          "GENERICx0x84x0xx86x64"
+                        "Fn::Join": [
+                          "",
+                          [
+                            "arn:aws:lambda:",
+                            {
+                              "Ref": "AWS::Region"
+                            },
+                            ":901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1"
+                          ]
                         ]
                       }
                     ],
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.ts
index 36c894d97dfb4..fa3b24b68a30a 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.ts
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.ts
@@ -33,7 +33,7 @@ class StackUnderTest extends Stack {
       code: Code.fromInline(`exports.handler = ${handler.toString()}`),
       architecture: props.architecture,
       adotInstrumentation: {
-        layerVersion: AdotLayerVersion.fromJavaScriptSdkLayerVersion(AdotLambdaLayerJavaScriptSdkVersion.V1_16_0),
+        layerVersion: AdotLayerVersion.fromJavaScriptSdkLayerVersion(AdotLambdaLayerJavaScriptSdkVersion.V1_17_1),
         execWrapper: AdotLambdaExecWrapper.REGULAR_HANDLER,
       },
     });
@@ -43,7 +43,7 @@ class StackUnderTest extends Stack {
       handler: 'index.handler',
       code: Code.fromInline('def handler(event, context): pass'),
       adotInstrumentation: {
-        layerVersion: AdotLayerVersion.fromPythonSdkLayerVersion(AdotLambdaLayerPythonSdkVersion.V1_20_0),
+        layerVersion: AdotLayerVersion.fromPythonSdkLayerVersion(AdotLambdaLayerPythonSdkVersion.V1_20_0_1),
         execWrapper: AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
       },
     });
@@ -53,7 +53,7 @@ class StackUnderTest extends Stack {
       handler: 'index.handler',
       code: Code.fromInline('def handler(event, context): pass'),
       adotInstrumentation: {
-        layerVersion: AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_30_0),
+        layerVersion: AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_31_0),
         execWrapper: AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
       },
     });
@@ -63,7 +63,7 @@ class StackUnderTest extends Stack {
       handler: 'index.handler',
       code: Code.fromInline('def handler(event, context): pass'),
       adotInstrumentation: {
-        layerVersion: AdotLayerVersion.fromJavaAutoInstrumentationLayerVersion(AdotLambdaLayerJavaAutoInstrumentationVersion.V1_30_0),
+        layerVersion: AdotLayerVersion.fromJavaAutoInstrumentationLayerVersion(AdotLambdaLayerJavaAutoInstrumentationVersion.V1_31_0),
         execWrapper: AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
       },
     });
@@ -73,7 +73,7 @@ class StackUnderTest extends Stack {
       handler: 'index.handler',
       code: Code.fromInline('def handler(event, context): pass'),
       adotInstrumentation: {
-        layerVersion: AdotLayerVersion.fromGenericLayerVersion(AdotLambdaLayerGenericVersion.V0_84_0),
+        layerVersion: AdotLayerVersion.fromGenericLayerVersion(AdotLambdaLayerGenericVersion.V0_88_0),
         execWrapper: AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
       },
     });
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts b/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts
index 736da980efbf2..7b7742672fcc2 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts
@@ -209,6 +209,11 @@ abstract class AdotLambdaLayerVersion {
  * The collection of versions of the ADOT Lambda Layer for Java SDK
  */
 export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
+  /**
+   * Version 1.31.0
+   */
+  public static readonly V1_31_0 = new AdotLambdaLayerJavaSdkVersion('1.31.0');
+
   /**
    * Version 1.30.0
    */
@@ -228,7 +233,7 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
    * The latest layer version available in this CDK version. New versions could
    * introduce incompatible changes. Make sure to test them before deploying to production.
    */
-  public static readonly LATEST = this.V1_30_0;
+  public static readonly LATEST = this.V1_31_0;
 
   private constructor(protected readonly layerVersion: string) {
     super(AdotLambdaLayerType.JAVA_SDK, layerVersion);
@@ -239,6 +244,11 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
  * The collection of versions of the ADOT Lambda Layer for Java auto-instrumentation
  */
 export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLayerVersion {
+  /**
+   * Version 1.31.0
+   */
+  public static readonly V1_31_0 = new AdotLambdaLayerJavaAutoInstrumentationVersion('1.31.0');
+
   /**
    * Version 1.30.0
    */
@@ -258,7 +268,7 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
    * The latest layer version available in this CDK version. New versions could
    * introduce incompatible changes. Make sure to test them before deploying to production.
    */
-  public static readonly LATEST = this.V1_30_0;
+  public static readonly LATEST = this.V1_31_0;
 
   private constructor(protected readonly layerVersion: string) {
     super(AdotLambdaLayerType.JAVA_AUTO_INSTRUMENTATION, layerVersion);
@@ -269,6 +279,11 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
  * The collection of versions of the ADOT Lambda Layer for Python SDK
  */
 export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
+  /**
+   * Version 1.20.0
+   */
+  public static readonly V1_20_0_1 = new AdotLambdaLayerPythonSdkVersion('1.20.0-1');
+
   /**
    * Version 1.20.0
    */
@@ -313,7 +328,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
    * The latest layer version available in this CDK version. New versions could
    * introduce incompatible changes. Make sure to test them before deploying to production.
    */
-  public static readonly LATEST = this.V1_20_0;
+  public static readonly LATEST = this.V1_20_0_1;
 
   private constructor(protected readonly layerVersion: string) {
     super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
@@ -324,6 +339,11 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
  * The collection of versions of the ADOT Lambda Layer for JavaScript SDK
  */
 export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion {
+  /**
+   * Version 1.17.1
+   */
+  public static readonly V1_17_1 = new AdotLambdaLayerJavaScriptSdkVersion('1.17.1');
+
   /**
    * Version 1.16.0
    */
@@ -343,7 +363,7 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
    * The latest layer version available in this CDK version. New versions could
    * introduce incompatible changes. Make sure to test them before deploying to production.
    */
-  public static readonly LATEST = this.V1_16_0;
+  public static readonly LATEST = this.V1_17_1;
 
   private constructor(protected readonly layerVersion: string) {
     super(AdotLambdaLayerType.JAVASCRIPT_SDK, layerVersion);
@@ -354,6 +374,11 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
  * The collection of versions of the ADOT Lambda Layer for generic purpose
  */
 export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
+  /**
+   * Version 0.88.0
+   */
+  public static readonly V0_88_0 = new AdotLambdaLayerGenericVersion('0.88.0');
+
   /**
    * Version 0.84.0
    */
@@ -373,7 +398,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
    * The latest layer version available in this CDK version. New versions could
    * introduce incompatible changes. Make sure to test them before deploying to production.
    */
-  public static readonly LATEST = this.V0_84_0;
+  public static readonly LATEST = this.V0_88_0;
   private constructor(protected readonly layerVersion: string) {
     super(AdotLambdaLayerType.GENERIC, layerVersion);
   }
diff --git a/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts b/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts
index c7881f8a099ba..4ae124612f2d6 100644
--- a/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts
+++ b/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts
@@ -21,10 +21,10 @@ describe('ADOT Lambda Layer', () => {
     });
 
     test('is added properly when the region information is available at synthesis time', () => {
-      const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_30_0.layerArn(fn.stack, fn.architecture);
+      const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_31_0.layerArn(fn.stack, fn.architecture);
 
       expect(layerArn).toEqual(
-        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1',
+        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
       );
     });
 
@@ -32,7 +32,7 @@ describe('ADOT Lambda Layer', () => {
       const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.LATEST.layerArn(fn.stack, fn.architecture);
 
       expect(layerArn).toEqual(
-        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1',
+        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
       );
     });
   });
@@ -53,10 +53,10 @@ describe('ADOT Lambda Layer', () => {
     });
 
     test('is added properly when the region information is available at synthesis time', () => {
-      const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0.layerArn(fn.stack, fn.architecture);
+      const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0_1.layerArn(fn.stack, fn.architecture);
 
       expect(layerArn).toEqual(
-        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2',
+        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
       );
     });
 
@@ -64,7 +64,7 @@ describe('ADOT Lambda Layer', () => {
       const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.LATEST.layerArn(fn.stack, fn.architecture);
 
       expect(layerArn).toEqual(
-        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2',
+        'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
       );
     });
   });
@@ -107,12 +107,15 @@ describe('ADOT Lambda Layer', () => {
       // THEN
       Template.fromStack(fn.stack).hasOutput('ExportLayerArn', {
         Value: {
-          'Fn::FindInMap': [
-            'AdotlambdalayerMap',
-            {
-              Ref: 'AWS::Region',
-            },
-            'JAVAxSDKx1x30x0xarm64',
+          'Fn::Join': [
+            '',
+            [
+              'arn:aws:lambda:',
+              {
+                Ref: 'AWS::Region',
+              },
+              ':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+            ],
           ],
         },
       });
diff --git a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
index 5bd6451e2e56e..b999126bd468e 100644
--- a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
+++ b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
@@ -3276,14 +3276,14 @@ describe('function', () => {
       handler: 'index.handler',
       runtime: lambda.Runtime.NODEJS_LATEST,
       adotInstrumentation: {
-        layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_30_0),
+        layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_31_0),
         execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
       },
     });
 
     // THEN
     Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
-      Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1'],
+      Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1'],
       Environment: {
         Variables: {
           AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
@@ -3305,14 +3305,14 @@ describe('function', () => {
       handler: 'index.handler',
       runtime: lambda.Runtime.PYTHON_3_9,
       adotInstrumentation: {
-        layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0),
+        layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0_1),
         execWrapper: lambda.AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
       },
     });
 
     // THEN
     Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
-      Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2'],
+      Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3'],
       Environment: {
         Variables: {
           AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
@@ -3329,7 +3329,7 @@ describe('function', () => {
       handler: 'index.handler',
       runtime: lambda.Runtime.PYTHON_3_10,
       adotInstrumentation: {
-        layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0),
+        layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_20_0_1),
         execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
       },
     })).toThrow(/Python Adot Lambda layer requires AdotLambdaExecWrapper.INSTRUMENT_HANDLER/);
@@ -3348,7 +3348,7 @@ describe('function', () => {
         new lambda.DockerImageFunction(stack, 'MyLambda', {
           code: lambda.DockerImageCode.fromImageAsset(dockerLambdaHandlerPath),
           adotInstrumentation: {
-            layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_30_0),
+            layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_31_0),
             execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
           },
         }),
diff --git a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts
index 4e1a38b9ffa2d..b19b691f7a154 100644
--- a/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts
+++ b/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts
@@ -825,6 +825,72 @@ export const PARAMS_AND_SECRETS_LAMBDA_LAYER_ARNS: { [version: string]: { [arch:
 };
 
 const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { [region: string]: string } } } = {
+  '1.31.0': {
+    x86_64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-31-0:1',
+    },
+    arm64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-31-0:1',
+    },
+  },
   '1.30.0': {
     x86_64: {
       'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-30-0:1',
@@ -1244,6 +1310,72 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: {
 const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: {
   [version: string]: { [arch: string]: { [region: string]: string } };
 } = {
+  '1.31.0': {
+    x86_64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-31-0:1',
+    },
+    arm64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-31-0:1',
+    },
+  },
   '1.30.0': {
     x86_64: {
       'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-30-0:1',
@@ -1659,8 +1791,73 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: {
     },
   },
 };
-
 const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: string]: { [region: string]: string } } } = {
+  '1.17.1': {
+    x86_64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-17-1:1',
+    },
+    arm64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-17-1:1',
+    },
+  },
   '1.16.0': {
     x86_64: {
       'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-16-0:2',
@@ -2040,6 +2237,72 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin
 };
 
 const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: { [region: string]: string } } } = {
+  '1.20.0-1': {
+    x86_64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      //'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:3',
+    },
+    arm64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-arm64-ver-1-20-0:3',
+    },
+  },
   '1.20.0': {
     x86_64: {
       'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-20-0:2',
@@ -2419,6 +2682,72 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]:
 };
 
 const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [region: string]: string } } } = {
+  '0.88.0': {
+    x86_64: {
+      //'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      //'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      //'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      //'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      //'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      //'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-88-0:1',
+    },
+    arm64: {
+      // 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      //'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      //'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      // 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'us-west-1': 'arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+      'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-arm64-ver-0-88-0:1',
+    },
+  },
   '0.84.0': {
     x86_64: {
       'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-84-0:1',