From 2f2867a2ffd23299e96b67d6db689625c736cad6 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Wed, 30 Aug 2023 16:10:15 -0500 Subject: [PATCH 1/9] Adding missing information for all supported regions --- .../region-info/build-tools/fact-tables.ts | 115 ++++++++++++++++-- 1 file changed, 108 insertions(+), 7 deletions(-) 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 e05a74dc24702..fafebb617f5cb 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 @@ -4,25 +4,26 @@ export const AWS_CDK_METADATA = new Set([ 'ap-east-1', 'ap-northeast-1', 'ap-northeast-2', - // 'ap-northeast-3', + 'ap-northeast-3', 'ap-south-1', - // 'ap-south-2', + 'ap-south-2', 'ap-southeast-1', 'ap-southeast-2', + 'ap-southeast-3', 'ap-southeast-4', 'ca-central-1', 'cn-north-1', 'cn-northwest-1', 'eu-central-1', - // 'eu-central-2', + 'eu-central-2', 'eu-north-1', 'eu-south-1', - // 'eu-south-2', + 'eu-south-2', 'eu-west-1', 'eu-west-2', 'eu-west-3', 'il-central-1', - // 'me-central-1', + 'me-central-1', 'me-south-1', 'sa-east-1', 'us-east-1', @@ -504,7 +505,7 @@ export const FIREHOSE_CIDR_BLOCKS: { [region: string]: string } = { 'ap-northeast-2': '13.209.1.64', 'ap-northeast-3': '13.208.177.192', 'ap-south-1': '13.232.67.32', - 'ap-south-2': '18.60.192.128', + 'ap-south-2': '18.60.192.192', 'ap-southeast-1': '13.228.64.192', 'ap-southeast-2': '13.210.67.224', 'ap-southeast-3': '108.136.221.64', @@ -521,7 +522,7 @@ export const FIREHOSE_CIDR_BLOCKS: { [region: string]: string } = { 'eu-west-2': '18.130.1.96', 'eu-west-3': '35.180.1.96', 'il-central-1': '51.16.102.64', - 'me-central-1': '3.28.159.32', + 'me-central-1': '3.28.159.64', 'me-south-1': '15.185.91.0', 'sa-east-1': '18.228.1.128', 'us-east-1': '52.70.63.192', @@ -596,21 +597,31 @@ 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.28.1': { x86_64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', @@ -618,21 +629,31 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', }, arm64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', @@ -929,21 +950,31 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { } = { '1.28.1': { x86_64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', @@ -951,21 +982,31 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { 'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', }, arm64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', @@ -1260,21 +1301,31 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: string]: { [region: string]: string } } } = { '1.15.0-1': { x86_64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', @@ -1282,21 +1333,31 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin 'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', }, arm64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', @@ -1553,21 +1614,31 @@ 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.19.0-1': { x86_64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', @@ -1575,21 +1646,31 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: 'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', }, arm64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', @@ -1846,21 +1927,31 @@ 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.82.0': { x86_64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', @@ -1868,21 +1959,31 @@ const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [ 'us-west-2': 'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', }, arm64: { + 'af-south-1': 'arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'us-east-2': 'arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', From 4c867b13f602eb71ae2c9624ac5a849bcd075dbc Mon Sep 17 00:00:00 2001 From: SankyRed Date: Thu, 31 Aug 2023 09:04:06 -0500 Subject: [PATCH 2/9] Setting the proper values for Firehose CIDR Block --- .../aws-cdk-lib/region-info/build-tools/fact-tables.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 fafebb617f5cb..d256a99337c7e 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 @@ -505,7 +505,6 @@ export const FIREHOSE_CIDR_BLOCKS: { [region: string]: string } = { 'ap-northeast-2': '13.209.1.64', 'ap-northeast-3': '13.208.177.192', 'ap-south-1': '13.232.67.32', - 'ap-south-2': '18.60.192.192', 'ap-southeast-1': '13.228.64.192', 'ap-southeast-2': '13.210.67.224', 'ap-southeast-3': '108.136.221.64', @@ -514,15 +513,13 @@ export const FIREHOSE_CIDR_BLOCKS: { [region: string]: string } = { 'cn-north-1': '52.81.151.32', 'cn-northwest-1': '161.189.23.64', 'eu-central-1': '35.158.127.160', - 'eu-central-2': '16.62.183.32', 'eu-north-1': '13.53.63.224', 'eu-south-1': '15.161.135.128', - 'eu-south-2': '18.100.71.96', 'eu-west-1': '52.19.239.192', 'eu-west-2': '18.130.1.96', 'eu-west-3': '35.180.1.96', - 'il-central-1': '51.16.102.64', - 'me-central-1': '3.28.159.64', + 'il-central-1': '51.16.102.0', + 'me-central-1': '3.28.159.32', 'me-south-1': '15.185.91.0', 'sa-east-1': '18.228.1.128', 'us-east-1': '52.70.63.192', From c9806929f130ee5fa64822d9697a5296e867db27 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Thu, 31 Aug 2023 12:09:04 -0500 Subject: [PATCH 3/9] Fixing the china regions --- .../region-info/build-tools/fact-tables.ts | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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 d256a99337c7e..e7c897ddf4d1d 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 @@ -606,8 +606,8 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', @@ -638,8 +638,8 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', @@ -959,8 +959,8 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', @@ -991,8 +991,8 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', @@ -1310,8 +1310,8 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', @@ -1342,8 +1342,8 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', @@ -1623,8 +1623,8 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', @@ -1655,8 +1655,8 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', @@ -1936,8 +1936,8 @@ const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [ 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', @@ -1968,8 +1968,8 @@ const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [ 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'cn-north-1': 'arn:aws:lambda:cn-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'cn-northwest-1': 'arn:aws:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', From f0e7432ae83f1278ef5d6338577241f5b6e8c695 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Thu, 31 Aug 2023 12:34:40 -0500 Subject: [PATCH 4/9] fixing the regions as on the pipeline --- .../region-info/build-tools/fact-tables.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 e7c897ddf4d1d..a793c8f149596 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 @@ -4,26 +4,26 @@ export const AWS_CDK_METADATA = new Set([ 'ap-east-1', 'ap-northeast-1', 'ap-northeast-2', - 'ap-northeast-3', + //'ap-northeast-3', 'ap-south-1', - 'ap-south-2', + //'ap-south-2', 'ap-southeast-1', 'ap-southeast-2', - 'ap-southeast-3', - 'ap-southeast-4', + //'ap-southeast-3', + //'ap-southeast-4', 'ca-central-1', 'cn-north-1', 'cn-northwest-1', 'eu-central-1', - 'eu-central-2', + //'eu-central-2', 'eu-north-1', 'eu-south-1', - 'eu-south-2', + //'eu-south-2', 'eu-west-1', 'eu-west-2', 'eu-west-3', - 'il-central-1', - 'me-central-1', + //'il-central-1', + //'me-central-1', 'me-south-1', 'sa-east-1', 'us-east-1', From 83ff4e30f0cca9e8c9d5981b097938b3de7e0288 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Fri, 1 Sep 2023 08:04:04 -0500 Subject: [PATCH 5/9] Fixing the build issue --- .../Stack1.assets.json | 4 +- .../Stack1.template.json | 289 +++++++++++++++--- .../Stack2.assets.json | 4 +- .../Stack2.template.json | 289 +++++++++++++++--- .../manifest.json | 16 +- .../integ.lambda-adot.js.snapshot/tree.json | 170 +++++------ .../cli-lib-alpha/THIRD_PARTY_LICENSES | 4 +- 7 files changed, 586 insertions(+), 190 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 b09d3fcf51539..7aab5a3855da7 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": { - "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b": { + "601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec": { "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": "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json", + "objectKey": "601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec.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 5e35b07eb3251..c60f0622535c4 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,15 +72,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xarm64" ] } ], @@ -169,15 +166,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -266,15 +260,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -363,15 +354,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -460,15 +448,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -489,6 +474,220 @@ ] } }, + "Mappings": { + "AdotlambdalayerMap": { + "af-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-3": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-3": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-4": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ca-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-northwest-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-3": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "il-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "sa-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + } + } + }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 5ead5d5c65c95..bfa495206f252 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": { - "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2": { + "f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a": { "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": "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json", + "objectKey": "f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a.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 51be65fd9ef4e..af33262b25bf0 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,15 +72,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xx86x64" ] } ], @@ -169,15 +166,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -266,15 +260,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -363,15 +354,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -460,15 +448,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -489,6 +474,220 @@ ] } }, + "Mappings": { + "AdotlambdalayerMap": { + "af-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-3": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-3": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-4": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ca-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-northwest-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-3": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "il-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "sa-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + } + } + }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 6eaeae90dafab..387ab39d44c0e 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 @@ -17,7 +17,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}/1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -51,6 +51,12 @@ "data": "MyFunc11BE70A62" } ], + "/Stack1/Adot-lambda-layerMap": [ + { + "type": "aws:cdk:logicalId", + "data": "AdotlambdalayerMap" + } + ], "/Stack1/MyFunc2/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", @@ -154,7 +160,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}/6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -188,6 +194,12 @@ "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 0e666ca3a40f1..50b290b8d3624 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,15 +131,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xarm64" ] } ], @@ -174,6 +171,14 @@ "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", @@ -294,15 +299,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -457,15 +459,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -620,15 +619,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -783,15 +779,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -975,15 +968,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xx86x64" ] } ], @@ -1018,6 +1008,14 @@ "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", @@ -1138,15 +1136,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -1301,15 +1296,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -1464,15 +1456,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -1627,15 +1616,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -1705,7 +1691,7 @@ "path": "IntegTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.69" + "version": "10.2.70" } }, "DeployAssert": { @@ -1751,7 +1737,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.69" + "version": "10.2.70" } } }, diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES index 768a185be9246..231613e7eabf1 100644 --- a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES +++ b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES @@ -1,6 +1,6 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/licensing: -** @jsii/check-node@1.87.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.87.0 | Apache-2.0 +** @jsii/check-node@1.88.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.88.0 | Apache-2.0 jsii Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. @@ -238,7 +238,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE ---------------- -** aws-sdk@2.1446.0 - https://www.npmjs.com/package/aws-sdk/v/2.1446.0 | Apache-2.0 +** aws-sdk@2.1447.0 - https://www.npmjs.com/package/aws-sdk/v/2.1447.0 | Apache-2.0 AWS SDK for JavaScript Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. From 272d475bf64aa081940476385fb2fca867b5b4e3 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Fri, 1 Sep 2023 09:32:36 -0500 Subject: [PATCH 6/9] Fixing the merge conflicts --- .../test-stack.template.json | 11 +---------- .../aws-cdk-firehose-delivery-stream.template.json | 11 +---------- ...rehose-delivery-stream-source-stream.template.json | 11 +---------- ...se-delivery-stream-s3-all-properties.template.json | 11 +---------- .../test/__snapshots__/region-info.test.ts.snap | 4 ++-- 5 files changed, 6 insertions(+), 42 deletions(-) diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json index e131d7e92c610..0b0c7bce3882d 100644 --- a/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json +++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json @@ -231,9 +231,6 @@ "ap-south-1": { "FirehoseCidrBlock": "13.232.67.32/27" }, - "ap-south-2": { - "FirehoseCidrBlock": "18.60.192.128/27" - }, "ap-southeast-1": { "FirehoseCidrBlock": "13.228.64.192/27" }, @@ -258,18 +255,12 @@ "eu-central-1": { "FirehoseCidrBlock": "35.158.127.160/27" }, - "eu-central-2": { - "FirehoseCidrBlock": "16.62.183.32/27" - }, "eu-north-1": { "FirehoseCidrBlock": "13.53.63.224/27" }, "eu-south-1": { "FirehoseCidrBlock": "15.161.135.128/27" }, - "eu-south-2": { - "FirehoseCidrBlock": "18.100.71.96/27" - }, "eu-west-1": { "FirehoseCidrBlock": "52.19.239.192/27" }, @@ -280,7 +271,7 @@ "FirehoseCidrBlock": "35.180.1.96/27" }, "il-central-1": { - "FirehoseCidrBlock": "51.16.102.64/27" + "FirehoseCidrBlock": "51.16.102.0/27" }, "me-central-1": { "FirehoseCidrBlock": "3.28.159.32/27" diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json index 32d90ce852d89..224216bc4fb4c 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json @@ -234,9 +234,6 @@ "ap-south-1": { "FirehoseCidrBlock": "13.232.67.32/27" }, - "ap-south-2": { - "FirehoseCidrBlock": "18.60.192.128/27" - }, "ap-southeast-1": { "FirehoseCidrBlock": "13.228.64.192/27" }, @@ -261,18 +258,12 @@ "eu-central-1": { "FirehoseCidrBlock": "35.158.127.160/27" }, - "eu-central-2": { - "FirehoseCidrBlock": "16.62.183.32/27" - }, "eu-north-1": { "FirehoseCidrBlock": "13.53.63.224/27" }, "eu-south-1": { "FirehoseCidrBlock": "15.161.135.128/27" }, - "eu-south-2": { - "FirehoseCidrBlock": "18.100.71.96/27" - }, "eu-west-1": { "FirehoseCidrBlock": "52.19.239.192/27" }, @@ -283,7 +274,7 @@ "FirehoseCidrBlock": "35.180.1.96/27" }, "il-central-1": { - "FirehoseCidrBlock": "51.16.102.64/27" + "FirehoseCidrBlock": "51.16.102.0/27" }, "me-central-1": { "FirehoseCidrBlock": "3.28.159.32/27" diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json index 68977b6dcbc15..cbf990668d7bf 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json @@ -250,9 +250,6 @@ "ap-south-1": { "FirehoseCidrBlock": "13.232.67.32/27" }, - "ap-south-2": { - "FirehoseCidrBlock": "18.60.192.128/27" - }, "ap-southeast-1": { "FirehoseCidrBlock": "13.228.64.192/27" }, @@ -277,18 +274,12 @@ "eu-central-1": { "FirehoseCidrBlock": "35.158.127.160/27" }, - "eu-central-2": { - "FirehoseCidrBlock": "16.62.183.32/27" - }, "eu-north-1": { "FirehoseCidrBlock": "13.53.63.224/27" }, "eu-south-1": { "FirehoseCidrBlock": "15.161.135.128/27" }, - "eu-south-2": { - "FirehoseCidrBlock": "18.100.71.96/27" - }, "eu-west-1": { "FirehoseCidrBlock": "52.19.239.192/27" }, @@ -299,7 +290,7 @@ "FirehoseCidrBlock": "35.180.1.96/27" }, "il-central-1": { - "FirehoseCidrBlock": "51.16.102.64/27" + "FirehoseCidrBlock": "51.16.102.0/27" }, "me-central-1": { "FirehoseCidrBlock": "3.28.159.32/27" diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json index 23eb3f098454b..f312295e7414f 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json @@ -700,9 +700,6 @@ "ap-south-1": { "FirehoseCidrBlock": "13.232.67.32/27" }, - "ap-south-2": { - "FirehoseCidrBlock": "18.60.192.128/27" - }, "ap-southeast-1": { "FirehoseCidrBlock": "13.228.64.192/27" }, @@ -727,18 +724,12 @@ "eu-central-1": { "FirehoseCidrBlock": "35.158.127.160/27" }, - "eu-central-2": { - "FirehoseCidrBlock": "16.62.183.32/27" - }, "eu-north-1": { "FirehoseCidrBlock": "13.53.63.224/27" }, "eu-south-1": { "FirehoseCidrBlock": "15.161.135.128/27" }, - "eu-south-2": { - "FirehoseCidrBlock": "18.100.71.96/27" - }, "eu-west-1": { "FirehoseCidrBlock": "52.19.239.192/27" }, @@ -749,7 +740,7 @@ "FirehoseCidrBlock": "35.180.1.96/27" }, "il-central-1": { - "FirehoseCidrBlock": "51.16.102.64/27" + "FirehoseCidrBlock": "51.16.102.0/27" }, "me-central-1": { "FirehoseCidrBlock": "3.28.159.32/27" diff --git a/packages/aws-cdk-lib/region-info/test/__snapshots__/region-info.test.ts.snap b/packages/aws-cdk-lib/region-info/test/__snapshots__/region-info.test.ts.snap index 9d26dd7827f9a..667e6ce300336 100644 --- a/packages/aws-cdk-lib/region-info/test/__snapshots__/region-info.test.ts.snap +++ b/packages/aws-cdk-lib/region-info/test/__snapshots__/region-info.test.ts.snap @@ -373,7 +373,7 @@ exports[`built-in data is correct 1`] = ` "vpcEndPointServiceNamePrefix": "com.amazonaws.vpce", }, "ap-southeast-4": { - "cdkMetadataResourceAvailable": true, + "cdkMetadataResourceAvailable": false, "domainSuffix": "amazonaws.com", "lambdaInsightsArmVersions": { "1.0.119.0": undefined, @@ -817,7 +817,7 @@ exports[`built-in data is correct 1`] = ` "vpcEndPointServiceNamePrefix": "com.amazonaws.vpce", }, "il-central-1": { - "cdkMetadataResourceAvailable": true, + "cdkMetadataResourceAvailable": false, "domainSuffix": "amazonaws.com", "lambdaInsightsArmVersions": { "1.0.119.0": undefined, From 3f963fe940dc2a310419ede3ada5c8fbb0eb78f6 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Tue, 5 Sep 2023 08:56:51 -0500 Subject: [PATCH 7/9] Resetting the files --- .../Stack1.assets.json | 4 +- .../Stack1.template.json | 289 +++--------------- .../Stack2.assets.json | 4 +- .../Stack2.template.json | 289 +++--------------- .../manifest.json | 16 +- .../integ.lambda-adot.js.snapshot/tree.json | 170 ++++++----- 6 files changed, 188 insertions(+), 584 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 7aab5a3855da7..b09d3fcf51539 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": { - "601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec": { + "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b": { "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": "601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec.json", + "objectKey": "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.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 c60f0622535c4..5e35b07eb3251 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" - }, - "JAVASCRIPTxSDKx1x15x0x1xarm64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" + ] ] } ], @@ -166,12 +169,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "PYTHONxSDKx1x19x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" + ] ] } ], @@ -260,12 +266,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxSDKx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" + ] ] } ], @@ -354,12 +363,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" + ] ] } ], @@ -448,12 +460,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "GENERICx0x82x0xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + ] ] } ], @@ -474,220 +489,6 @@ ] } }, - "Mappings": { - "AdotlambdalayerMap": { - "af-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-3": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-south-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-3": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-4": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ca-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "cn-north-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "cn-northwest-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-central-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-north-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-south-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-3": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "il-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "me-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "me-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "sa-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-east-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-west-1": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-west-2": { - "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 bfa495206f252..5ead5d5c65c95 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": { - "f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a": { + "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2": { "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": "f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a.json", + "objectKey": "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.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 af33262b25bf0..51be65fd9ef4e 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" - }, - "JAVASCRIPTxSDKx1x15x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" + ] ] } ], @@ -166,12 +169,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "PYTHONxSDKx1x19x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" + ] ] } ], @@ -260,12 +266,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxSDKx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" + ] ] } ], @@ -354,12 +363,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" + ] ] } ], @@ -448,12 +460,15 @@ "Handler": "index.handler", "Layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "GENERICx0x82x0xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + ] ] } ], @@ -474,220 +489,6 @@ ] } }, - "Mappings": { - "AdotlambdalayerMap": { - "af-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-northeast-3": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-south-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-3": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ap-southeast-4": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "ca-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "cn-north-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "cn-northwest-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-central-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-north-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-south-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "eu-west-3": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "il-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "me-central-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "me-south-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "sa-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-east-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-east-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-west-1": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - }, - "us-west-2": { - "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", - "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", - "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", - "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - } - } - }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 387ab39d44c0e..6eaeae90dafab 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 @@ -17,7 +17,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}/601f9cad29cc7780d24a9ed6d31449f984d88bd7340dc1204c476443b8a6bdec.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -51,12 +51,6 @@ "data": "MyFunc11BE70A62" } ], - "/Stack1/Adot-lambda-layerMap": [ - { - "type": "aws:cdk:logicalId", - "data": "AdotlambdalayerMap" - } - ], "/Stack1/MyFunc2/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", @@ -160,7 +154,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}/f13eafb8d22bfe5783b0bad6ecf2b80f6b8a6b44b91e3dc935e1265c8a36313a.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -194,12 +188,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 50b290b8d3624..0e666ca3a40f1 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" - }, - "JAVASCRIPTxSDKx1x15x0x1xarm64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" + ] ] } ], @@ -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" - }, - "PYTHONxSDKx1x19x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" + ] ] } ], @@ -459,12 +457,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxSDKx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" + ] ] } ], @@ -619,12 +620,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" + ] ] } ], @@ -779,12 +783,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "GENERICx0x82x0xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + ] ] } ], @@ -968,12 +975,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVASCRIPTxSDKx1x15x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" + ] ] } ], @@ -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" - }, - "PYTHONxSDKx1x19x0x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" + ] ] } ], @@ -1296,12 +1301,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxSDKx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" + ] ] } ], @@ -1456,12 +1464,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" + ] ] } ], @@ -1616,12 +1627,15 @@ "handler": "index.handler", "layers": [ { - "Fn::FindInMap": [ - "AdotlambdalayerMap", - { - "Ref": "AWS::Region" - }, - "GENERICx0x82x0xx86x64" + "Fn::Join": [ + "", + [ + "arn:aws:lambda:", + { + "Ref": "AWS::Region" + }, + ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + ] ] } ], @@ -1691,7 +1705,7 @@ "path": "IntegTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.2.69" } }, "DeployAssert": { @@ -1737,7 +1751,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.2.69" } } }, From 914569a3dc2f9e35cdbc51f2cf2ade734fad693c Mon Sep 17 00:00:00 2001 From: SankyRed Date: Tue, 5 Sep 2023 11:58:35 -0500 Subject: [PATCH 8/9] Code cleanup --- .../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 | 170 ++++++------- .../region-info/build-tools/fact-tables.ts | 176 ++++++------- 7 files changed, 560 insertions(+), 276 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 b09d3fcf51539..3ca5bbe479374 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": { - "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b": { + "01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3": { "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": "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json", + "objectKey": "01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.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 5e35b07eb3251..efcbff687e337 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,15 +72,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xarm64" ] } ], @@ -169,15 +166,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -266,15 +260,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -363,15 +354,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -460,15 +448,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -489,6 +474,164 @@ ] } }, + "Mappings": { + "AdotlambdalayerMap": { + "af-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ca-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-northwest-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-3": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "sa-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xarm64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + } + } + }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 5ead5d5c65c95..145950d846585 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": { - "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2": { + "e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a": { "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": "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json", + "objectKey": "e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.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 51be65fd9ef4e..3b54196555aa9 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,15 +72,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xx86x64" ] } ], @@ -169,15 +166,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -266,15 +260,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -363,15 +354,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -460,15 +448,12 @@ "Handler": "index.handler", "Layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -489,6 +474,164 @@ ] } }, + "Mappings": { + "AdotlambdalayerMap": { + "af-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:af-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-northeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ap-southeast-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "ca-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "cn-northwest-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-central-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-north-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "eu-west-3": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "me-south-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "sa-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-east-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-1": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + }, + "us-west-2": { + "JAVASCRIPTxSDKx1x15x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2", + "PYTHONxSDKx1x19x0x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2", + "JAVAxSDKx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1", + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1", + "GENERICx0x82x0xx86x64": "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" + } + } + }, "Parameters": { "BootstrapVersion": { "Type": "AWS::SSM::Parameter::Value", 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 6eaeae90dafab..8a93a596ccf2b 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 @@ -17,7 +17,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}/1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -51,6 +51,12 @@ "data": "MyFunc11BE70A62" } ], + "/Stack1/Adot-lambda-layerMap": [ + { + "type": "aws:cdk:logicalId", + "data": "AdotlambdalayerMap" + } + ], "/Stack1/MyFunc2/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", @@ -154,7 +160,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}/6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -188,6 +194,12 @@ "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 0e666ca3a40f1..50b290b8d3624 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,15 +131,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xarm64" ] } ], @@ -174,6 +171,14 @@ "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", @@ -294,15 +299,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -457,15 +459,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -620,15 +619,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -783,15 +779,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -975,15 +968,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVASCRIPTxSDKx1x15x0x1xx86x64" ] } ], @@ -1018,6 +1008,14 @@ "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", @@ -1138,15 +1136,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "PYTHONxSDKx1x19x0x1xx86x64" ] } ], @@ -1301,15 +1296,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxSDKx1x28x1xx86x64" ] } ], @@ -1464,15 +1456,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64" ] } ], @@ -1627,15 +1616,12 @@ "handler": "index.handler", "layers": [ { - "Fn::Join": [ - "", - [ - "arn:aws:lambda:", - { - "Ref": "AWS::Region" - }, - ":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1" - ] + "Fn::FindInMap": [ + "AdotlambdalayerMap", + { + "Ref": "AWS::Region" + }, + "GENERICx0x82x0xx86x64" ] } ], @@ -1705,7 +1691,7 @@ "path": "IntegTest/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.69" + "version": "10.2.70" } }, "DeployAssert": { @@ -1751,7 +1737,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.69" + "version": "10.2.70" } } }, 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 a793c8f149596..23cbae530ee8c 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 @@ -4,26 +4,26 @@ export const AWS_CDK_METADATA = new Set([ 'ap-east-1', 'ap-northeast-1', 'ap-northeast-2', - //'ap-northeast-3', + // 'ap-northeast-3', 'ap-south-1', - //'ap-south-2', + // 'ap-south-2', 'ap-southeast-1', 'ap-southeast-2', - //'ap-southeast-3', - //'ap-southeast-4', + // 'ap-southeast-3', + // 'ap-southeast-4', 'ca-central-1', 'cn-north-1', 'cn-northwest-1', 'eu-central-1', - //'eu-central-2', + // 'eu-central-2', 'eu-north-1', 'eu-south-1', - //'eu-south-2', + // 'eu-south-2', 'eu-west-1', 'eu-west-2', 'eu-west-3', - //'il-central-1', - //'me-central-1', + // 'il-central-1', + // 'me-central-1', 'me-south-1', 'sa-east-1', 'us-east-1', @@ -598,26 +598,26 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + //'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', @@ -630,26 +630,26 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', @@ -951,26 +951,26 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1', @@ -983,26 +983,26 @@ const ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS: { 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-java-agent-arm64-ver-1-28-1:1', @@ -1302,26 +1302,26 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2', @@ -1334,26 +1334,26 @@ const ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS: { [version: string]: { [arch: strin 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2', @@ -1615,26 +1615,26 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2', @@ -1647,26 +1647,26 @@ const ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS: { [version: string]: { [arch: string]: 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python-arm64-ver-1-19-0:2', @@ -1928,26 +1928,26 @@ const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [ 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1', @@ -1960,26 +1960,26 @@ const ADOT_LAMBDA_LAYER_GENERIC_ARNS: { [version: string]: { [arch: string]: { [ 'ap-east-1': 'arn:aws:lambda:ap-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-south-1': 'arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'ap-south-2': 'arn:aws:lambda:ap-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'ca-central-1': 'arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-central-1': 'arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'eu-central-2': 'arn:aws:lambda:eu-central-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-north-1': 'arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-south-1': 'arn:aws:lambda:eu-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'eu-south-2': 'arn:aws:lambda:eu-south-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', - 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', + // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', 'us-east-1': 'arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-collector-arm64-ver-0-82-0:1', From f84b2a3b72a4a4f2e37ff7b2544acf21607448e7 Mon Sep 17 00:00:00 2001 From: SankyRed Date: Tue, 5 Sep 2023 13:35:56 -0500 Subject: [PATCH 9/9] Fix the build --- packages/aws-cdk-lib/aws-lambda/test/adot.test.ts | 15 ++++++--------- .../region-info/build-tools/fact-tables.ts | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) 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 8189a6da43e72..9477406688a5d 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/adot.test.ts @@ -107,15 +107,12 @@ describe('ADOT Lambda Layer', () => { // THEN Template.fromStack(fn.stack).hasOutput('ExportLayerArn', { Value: { - 'Fn::Join': [ - '', - [ - 'arn:aws:lambda:', - { - Ref: 'AWS::Region', - }, - ':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-28-1:1', - ], + 'Fn::FindInMap': [ + 'AdotlambdalayerMap', + { + Ref: 'AWS::Region', + }, + 'JAVAxSDKx1x28x1xarm64', ], }, }); 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 23cbae530ee8c..1c058c663c02b 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 @@ -616,7 +616,7 @@ const ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS: { [version: string]: { [arch: string]: { 'eu-west-1': 'arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-2': 'arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'eu-west-3': 'arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', - //'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', + // 'il-central-1': 'arn:aws:lambda:il-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', // 'me-central-1': 'arn:aws:lambda:me-central-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'me-south-1': 'arn:aws:lambda:me-south-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1', 'sa-east-1': 'arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1',