Skip to content

Commit ad9d764

Browse files
vasireddy99vasireddy99
authored
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*
1 parent cab7745 commit ad9d764

File tree

13 files changed

+238
-270
lines changed

13 files changed

+238
-270
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "32.0.0",
2+
"version": "33.0.0",
33
"files": {
44
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
55
"source": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "32.0.0",
2+
"version": "33.0.0",
33
"files": {
4-
"1e011d502b5efbd34b58f00a70ccf34fb812c6af28ee32ffe796b007503169f1": {
4+
"0a057723ee23dd83fb3c1e47ef1ceee53b1aeb809908b5e428c6081b212a6ada": {
55
"source": {
66
"path": "Stack1.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "1e011d502b5efbd34b58f00a70ccf34fb812c6af28ee32ffe796b007503169f1.json",
12+
"objectKey": "0a057723ee23dd83fb3c1e47ef1ceee53b1aeb809908b5e428c6081b212a6ada.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json

Lines changed: 46 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,12 @@
5858
"MyFunc11BE70A62": {
5959
"Type": "AWS::Lambda::Function",
6060
"Properties": {
61-
"Code": {
62-
"ZipFile": "exports.handler = function handler(event, _context, callback) {\n console.log(JSON.stringify(event, undefined, 2));\n return callback();\n}"
63-
},
64-
"Role": {
65-
"Fn::GetAtt": [
66-
"MyFunc1ServiceRoleF96C5B5C",
67-
"Arn"
68-
]
69-
},
7061
"Architectures": [
7162
"arm64"
7263
],
64+
"Code": {
65+
"ZipFile": "exports.handler = function handler(event, _context, callback) {\n console.log(JSON.stringify(event, undefined, 2));\n return callback();\n}"
66+
},
7367
"Environment": {
7468
"Variables": {
7569
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-handler"
@@ -78,15 +72,24 @@
7872
"Handler": "index.handler",
7973
"Layers": [
8074
{
81-
"Fn::FindInMap": [
82-
"AdotlambdalayerMap",
83-
{
84-
"Ref": "AWS::Region"
85-
},
86-
"JAVASCRIPTxSDKx1x7x0xarm64"
75+
"Fn::Join": [
76+
"",
77+
[
78+
"arn:aws:lambda:",
79+
{
80+
"Ref": "AWS::Region"
81+
},
82+
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2"
83+
]
8784
]
8885
}
8986
],
87+
"Role": {
88+
"Fn::GetAtt": [
89+
"MyFunc1ServiceRoleF96C5B5C",
90+
"Arn"
91+
]
92+
},
9093
"Runtime": "nodejs14.x",
9194
"TracingConfig": {
9295
"Mode": "Active"
@@ -158,12 +161,6 @@
158161
"Code": {
159162
"ZipFile": "def handler(event, context): pass"
160163
},
161-
"Role": {
162-
"Fn::GetAtt": [
163-
"MyFunc2ServiceRole68E50443",
164-
"Arn"
165-
]
166-
},
167164
"Environment": {
168165
"Variables": {
169166
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -179,11 +176,17 @@
179176
{
180177
"Ref": "AWS::Region"
181178
},
182-
":901920570463:layer:aws-otel-python-amd64-ver-1-18-0:2"
179+
":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
183180
]
184181
]
185182
}
186183
],
184+
"Role": {
185+
"Fn::GetAtt": [
186+
"MyFunc2ServiceRole68E50443",
187+
"Arn"
188+
]
189+
},
187190
"Runtime": "python3.9",
188191
"TracingConfig": {
189192
"Mode": "Active"
@@ -255,12 +258,6 @@
255258
"Code": {
256259
"ZipFile": "def handler(event, context): pass"
257260
},
258-
"Role": {
259-
"Fn::GetAtt": [
260-
"MyFunc3ServiceRoleA69795ED",
261-
"Arn"
262-
]
263-
},
264261
"Environment": {
265262
"Variables": {
266263
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -276,11 +273,17 @@
276273
{
277274
"Ref": "AWS::Region"
278275
},
279-
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-19-0:1"
276+
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
280277
]
281278
]
282279
}
283280
],
281+
"Role": {
282+
"Fn::GetAtt": [
283+
"MyFunc3ServiceRoleA69795ED",
284+
"Arn"
285+
]
286+
},
284287
"Runtime": "python3.9",
285288
"TracingConfig": {
286289
"Mode": "Active"
@@ -352,12 +355,6 @@
352355
"Code": {
353356
"ZipFile": "def handler(event, context): pass"
354357
},
355-
"Role": {
356-
"Fn::GetAtt": [
357-
"MyFunc4ServiceRole93C4DEFF",
358-
"Arn"
359-
]
360-
},
361358
"Environment": {
362359
"Variables": {
363360
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -373,11 +370,17 @@
373370
{
374371
"Ref": "AWS::Region"
375372
},
376-
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-19-2:1"
373+
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
377374
]
378375
]
379376
}
380377
],
378+
"Role": {
379+
"Fn::GetAtt": [
380+
"MyFunc4ServiceRole93C4DEFF",
381+
"Arn"
382+
]
383+
},
381384
"Runtime": "python3.9",
382385
"TracingConfig": {
383386
"Mode": "Active"
@@ -449,12 +452,6 @@
449452
"Code": {
450453
"ZipFile": "def handler(event, context): pass"
451454
},
452-
"Role": {
453-
"Fn::GetAtt": [
454-
"MyFunc5ServiceRoleFE4CE92B",
455-
"Arn"
456-
]
457-
},
458455
"Environment": {
459456
"Variables": {
460457
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/otel-instrument"
@@ -470,11 +467,17 @@
470467
{
471468
"Ref": "AWS::Region"
472469
},
473-
":901920570463:layer:aws-otel-collector-amd64-ver-0-62-1:1"
470+
":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
474471
]
475472
]
476473
}
477474
],
475+
"Role": {
476+
"Fn::GetAtt": [
477+
"MyFunc5ServiceRoleFE4CE92B",
478+
"Arn"
479+
]
480+
},
478481
"Runtime": "python3.9",
479482
"TracingConfig": {
480483
"Mode": "Active"
@@ -486,58 +489,6 @@
486489
]
487490
}
488491
},
489-
"Mappings": {
490-
"AdotlambdalayerMap": {
491-
"ap-northeast-1": {
492-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
493-
},
494-
"ap-northeast-2": {
495-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
496-
},
497-
"ap-south-1": {
498-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
499-
},
500-
"ap-southeast-1": {
501-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
502-
},
503-
"ap-southeast-2": {
504-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
505-
},
506-
"ca-central-1": {
507-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
508-
},
509-
"eu-central-1": {
510-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
511-
},
512-
"eu-north-1": {
513-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
514-
},
515-
"eu-west-1": {
516-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
517-
},
518-
"eu-west-2": {
519-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
520-
},
521-
"eu-west-3": {
522-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
523-
},
524-
"sa-east-1": {
525-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
526-
},
527-
"us-east-1": {
528-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
529-
},
530-
"us-east-2": {
531-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
532-
},
533-
"us-west-1": {
534-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:1"
535-
},
536-
"us-west-2": {
537-
"JAVASCRIPTxSDKx1x7x0xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-7-0:2"
538-
}
539-
}
540-
},
541492
"Parameters": {
542493
"BootstrapVersion": {
543494
"Type": "AWS::SSM::Parameter::Value<String>",

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "32.0.0",
2+
"version": "33.0.0",
33
"files": {
4-
"45de98e0bad004888e2b3a349cf7b69b966cff9ba6effb99b03e462c69adae21": {
4+
"5f65e129af8492d163c28dcb80d294d6b4b93120afa30f095a40a2a5ea5f6296": {
55
"source": {
66
"path": "Stack2.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "45de98e0bad004888e2b3a349cf7b69b966cff9ba6effb99b03e462c69adae21.json",
12+
"objectKey": "5f65e129af8492d163c28dcb80d294d6b4b93120afa30f095a40a2a5ea5f6296.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

0 commit comments

Comments
 (0)