Skip to content

Commit a262db4

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into automation/spec-update
2 parents 9bae751 + 0399ec3 commit a262db4

10 files changed

Lines changed: 226 additions & 140 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{
8080
"Ref": "AWS::Region"
8181
},
82-
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-18-1:1"
82+
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-18-1:3"
8383
]
8484
]
8585
}
@@ -176,7 +176,7 @@
176176
{
177177
"Ref": "AWS::Region"
178178
},
179-
":901920570463:layer:aws-otel-python-amd64-ver-1-21-0:1"
179+
":901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1"
180180
]
181181
]
182182
}
@@ -273,7 +273,7 @@
273273
{
274274
"Ref": "AWS::Region"
275275
},
276-
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:1"
276+
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2"
277277
]
278278
]
279279
}
@@ -370,7 +370,7 @@
370370
{
371371
"Ref": "AWS::Region"
372372
},
373-
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:1"
373+
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:2"
374374
]
375375
]
376376
}
@@ -467,7 +467,7 @@
467467
{
468468
"Ref": "AWS::Region"
469469
},
470-
":901920570463:layer:aws-otel-collector-amd64-ver-0-90-1:1"
470+
":901920570463:layer:aws-otel-collector-amd64-ver-0-98-0:5"
471471
]
472472
]
473473
}

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{
8080
"Ref": "AWS::Region"
8181
},
82-
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-18-1:1"
82+
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-18-1:3"
8383
]
8484
]
8585
}
@@ -176,7 +176,7 @@
176176
{
177177
"Ref": "AWS::Region"
178178
},
179-
":901920570463:layer:aws-otel-python-amd64-ver-1-21-0:1"
179+
":901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1"
180180
]
181181
]
182182
}
@@ -273,7 +273,7 @@
273273
{
274274
"Ref": "AWS::Region"
275275
},
276-
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:1"
276+
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2"
277277
]
278278
]
279279
}
@@ -370,7 +370,7 @@
370370
{
371371
"Ref": "AWS::Region"
372372
},
373-
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:1"
373+
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:2"
374374
]
375375
]
376376
}
@@ -467,7 +467,7 @@
467467
{
468468
"Ref": "AWS::Region"
469469
},
470-
":901920570463:layer:aws-otel-collector-amd64-ver-0-90-1:1"
470+
":901920570463:layer:aws-otel-collector-amd64-ver-0-98-0:5"
471471
]
472472
]
473473
}

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,11 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
289289
* The collection of versions of the ADOT Lambda Layer for Python SDK
290290
*/
291291
export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
292+
/**
293+
* Version 1.24.0
294+
*/
295+
public static readonly V1_24_0 = new AdotLambdaLayerPythonSdkVersion('1.24.0');
296+
292297
/**
293298
* Version 1.21.0
294299
*/
@@ -343,7 +348,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
343348
* The latest layer version available in this CDK version. New versions could
344349
* introduce incompatible changes. Make sure to test them before deploying to production.
345350
*/
346-
public static readonly LATEST = this.V1_21_0;
351+
public static readonly LATEST = this.V1_24_0;
347352

348353
private constructor(protected readonly layerVersion: string) {
349354
super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
@@ -394,6 +399,11 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
394399
* The collection of versions of the ADOT Lambda Layer for generic purpose
395400
*/
396401
export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
402+
/**
403+
* Version 0.98.0
404+
*/
405+
public static readonly V0_98_0 = new AdotLambdaLayerGenericVersion('0.98.0');
406+
397407
/**
398408
* Version 0.90.1
399409
*/
@@ -423,7 +433,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
423433
* The latest layer version available in this CDK version. New versions could
424434
* introduce incompatible changes. Make sure to test them before deploying to production.
425435
*/
426-
public static readonly LATEST = this.V0_90_1;
436+
public static readonly LATEST = this.V0_98_0;
427437

428438
private constructor(protected readonly layerVersion: string) {
429439
super(AdotLambdaLayerType.GENERIC, layerVersion);

‎packages/aws-cdk-lib/aws-lambda/test/adot.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ describe('ADOT Lambda Layer', () => {
2424
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0.layerArn(fn.stack, fn.architecture);
2525

2626
expect(layerArn).toEqual(
27-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:1',
27+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2',
2828
);
2929
});
3030

3131
test('is added properly when using "LATEST" version', () => {
3232
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.LATEST.layerArn(fn.stack, fn.architecture);
3333

3434
expect(layerArn).toEqual(
35-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:1',
35+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2',
3636
);
3737
});
3838
});
@@ -53,18 +53,18 @@ describe('ADOT Lambda Layer', () => {
5353
});
5454

5555
test('is added properly when the region information is available at synthesis time', () => {
56-
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_21_0.layerArn(fn.stack, fn.architecture);
56+
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_24_0.layerArn(fn.stack, fn.architecture);
5757

5858
expect(layerArn).toEqual(
59-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-21-0:1',
59+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1',
6060
);
6161
});
6262

6363
test('is added properly when using "LATEST" version', () => {
6464
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.LATEST.layerArn(fn.stack, fn.architecture);
6565

6666
expect(layerArn).toEqual(
67-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-21-0:1',
67+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1',
6868
);
6969
});
7070
});
@@ -114,7 +114,7 @@ describe('ADOT Lambda Layer', () => {
114114
{
115115
Ref: 'AWS::Region',
116116
},
117-
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:1',
117+
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:2',
118118
],
119119
],
120120
},

‎packages/aws-cdk-lib/aws-lambda/test/function.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3499,7 +3499,7 @@ describe('function', () => {
34993499

35003500
// THEN
35013501
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3502-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:1'],
3502+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2'],
35033503
Environment: {
35043504
Variables: {
35053505
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
@@ -3521,14 +3521,14 @@ describe('function', () => {
35213521
handler: 'index.handler',
35223522
runtime: lambda.Runtime.PYTHON_3_9,
35233523
adotInstrumentation: {
3524-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_21_0),
3524+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_24_0),
35253525
execWrapper: lambda.AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
35263526
},
35273527
});
35283528

35293529
// THEN
35303530
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3531-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-21-0:1'],
3531+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1'],
35323532
Environment: {
35333533
Variables: {
35343534
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
@@ -3545,7 +3545,7 @@ describe('function', () => {
35453545
handler: 'index.handler',
35463546
runtime: lambda.Runtime.PYTHON_3_10,
35473547
adotInstrumentation: {
3548-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_21_0),
3548+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_24_0),
35493549
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
35503550
},
35513551
})).toThrow(/Python Adot Lambda layer requires AdotLambdaExecWrapper.INSTRUMENT_HANDLER/);

0 commit comments

Comments
 (0)