fix(aws-cdk-lib): ADOT Lambda Layer constants update - v0.32.0 (#26801)

Update constants/doc for ADOT Lambda Layer Reference PR - #26793 **NOTE** This PR requires an update to an integration test and am unable to run the `cdk-integ` tool to perform a real deployment ---- *By submitting this pull request, I confirm that I make my contribution under the terms of the Apache-2.0 license*
aws · Aug 24, 2023 · ad9d764 · ad9d764
1 parent cab7745
commit ad9d764
Show file tree

Hide file tree

Showing 13 changed files with 238 additions and 270 deletions.
diff --git a/...a/test/integ.lambda-adot.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json b/...a/test/integ.lambda-adot.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "32.0.0",
+  "version": "33.0.0",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {

diff --git a/...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json b/...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "32.0.0",
+  "version": "33.0.0",
   "files": {
-    "1e011d502b5efbd34b58f00a70ccf34fb812c6af28ee32ffe796b007503169f1": {
+    "0a057723ee23dd83fb3c1e47ef1ceee53b1aeb809908b5e428c6081b212a6ada": {
       "source": {
         "path": "Stack1.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "1e011d502b5efbd34b58f00a70ccf34fb812c6af28ee32ffe796b007503169f1.json",
+          "objectKey": "0a057723ee23dd83fb3c1e47ef1ceee53b1aeb809908b5e428c6081b212a6ada.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...g/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json b/...g/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
@@ -58,18 +58,12 @@
   "MyFunc11BE70A62": {
    "Type": "AWS::Lambda::Function",
    "Properties": {
-    "Code": {
-     "ZipFile": "exports.handler = function handler(event, _context, callback) {\n    console.log(JSON.stringify(event, undefined, 2));\n    return callback();\n}"
-    },
-    "Role": {
-     "Fn::GetAtt": [
-      "MyFunc1ServiceRoleF96C5B5C",
-      "Arn"
-     ]
-    },
     "Architectures": [
      "arm64"
     ],
+    "Code": {
+     "ZipFile": "exports.handler = function handler(event, _context, callback) {\n    console.log(JSON.stringify(event, undefined, 2));\n    return callback();\n}"
+    },
     "Environment": {
      "Variables": {
       "AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-handler"
@@ -78,15 +72,24 @@
     "Handler": "index.handler",
     "Layers": [
      {
-      "Fn::FindInMap": [
-       "AdotlambdalayerMap",
-       {
-        "Ref": "AWS::Region"
-       },
-       "JAVASCRIPTxSDKx1x7x0xarm64"
+      "Fn::Join": [
+       "",
+       [
+        "arn:aws:lambda:",
+        {
+         "Ref": "AWS::Region"
+        },
+        ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2"
+       ]
       ]
      }
     ],
+    "Role": {
+     "Fn::GetAtt": [
+      "MyFunc1ServiceRoleF96C5B5C",
+      "Arn"
+     ]
+    },
     "Runtime": "nodejs14.x",
     "TracingConfig": {
      "Mode": "Active"
@@ -158,12 +161,6 @@
     "Code": {
      "ZipFile": "def handler(event, context): pass"
     },
-    "Role": {
-     "Fn::GetAtt": [
-      "MyFunc2ServiceRole68E50443",
-      "Arn"
-     ]
-    },
     "Environment": {
      "Variables": {
       "AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -179,11 +176,17 @@
         {
          "Ref": "AWS::Region"
         },
-        ":901920570463:layer:aws-otel-python-amd64-ver-1-18-0:2"
+        ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
        ]
       ]
      }
     ],
+    "Role": {
+     "Fn::GetAtt": [
+      "MyFunc2ServiceRole68E50443",
+      "Arn"
+     ]
+    },
     "Runtime": "python3.9",
     "TracingConfig": {
      "Mode": "Active"
@@ -255,12 +258,6 @@
     "Code": {
      "ZipFile": "def handler(event, context): pass"
     },
-    "Role": {
-     "Fn::GetAtt": [
-      "MyFunc3ServiceRoleA69795ED",
-      "Arn"
-     ]
-    },
     "Environment": {
      "Variables": {
       "AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -276,11 +273,17 @@
         {
          "Ref": "AWS::Region"
         },
-        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-19-0:1"
+        ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
        ]
       ]
      }
     ],
+    "Role": {
+     "Fn::GetAtt": [
+      "MyFunc3ServiceRoleA69795ED",
+      "Arn"
+     ]
+    },
     "Runtime": "python3.9",
     "TracingConfig": {
      "Mode": "Active"
@@ -352,12 +355,6 @@
     "Code": {
      "ZipFile": "def handler(event, context): pass"
     },
-    "Role": {
-     "Fn::GetAtt": [
-      "MyFunc4ServiceRole93C4DEFF",
-      "Arn"
-     ]
-    },
     "Environment": {
      "Variables": {
       "AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -373,11 +370,17 @@
         {
          "Ref": "AWS::Region"
         },
-        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-19-2:1"
+        ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
        ]
       ]
      }
     ],
+    "Role": {
+     "Fn::GetAtt": [
+      "MyFunc4ServiceRole93C4DEFF",
+      "Arn"
+     ]
+    },
     "Runtime": "python3.9",
     "TracingConfig": {
      "Mode": "Active"
@@ -449,12 +452,6 @@
     "Code": {
      "ZipFile": "def handler(event, context): pass"
     },
-    "Role": {
-     "Fn::GetAtt": [
-      "MyFunc5ServiceRoleFE4CE92B",
-      "Arn"
-     ]
-    },
     "Environment": {
      "Variables": {
       "AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -470,11 +467,17 @@
         {
          "Ref": "AWS::Region"
         },
-        ":901920570463:layer:aws-otel-collector-amd64-ver-0-62-1:1"
+        ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
        ]
       ]
      }
     ],
+    "Role": {
+     "Fn::GetAtt": [
+      "MyFunc5ServiceRoleFE4CE92B",
+      "Arn"
+     ]
+    },
     "Runtime": "python3.9",
     "TracingConfig": {
      "Mode": "Active"
@@ -486,58 +489,6 @@
    ]
   }
  },
- "Mappings": {
-  "AdotlambdalayerMap": {
-   "ap-northeast-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "ap-northeast-2": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "ap-south-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "ap-southeast-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "ap-southeast-2": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "ca-central-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "eu-central-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "eu-north-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "eu-west-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "eu-west-2": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "eu-west-3": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "sa-east-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "us-east-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "us-east-2": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   },
-   "us-west-1": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
-   },
-   "us-west-2": {
-    "JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
-   }
-  }
- },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",

diff --git a/...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json b/...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "32.0.0",
+  "version": "33.0.0",
   "files": {
-    "45de98e0bad004888e2b3a349cf7b69b966cff9ba6effb99b03e462c69adae21": {
+    "5f65e129af8492d163c28dcb80d294d6b4b93120afa30f095a40a2a5ea5f6296": {
       "source": {
         "path": "Stack2.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "45de98e0bad004888e2b3a349cf7b69b966cff9ba6effb99b03e462c69adae21.json",
+          "objectKey": "5f65e129af8492d163c28dcb80d294d6b4b93120afa30f095a40a2a5ea5f6296.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }