Skip to content

Commit 55b4ea6

Browse files
committed
Update Patched Lambda Layers for v0.115.0
1 parent ef02724 commit 55b4ea6

File tree

4 files changed

+233
-18
lines changed

4 files changed

+233
-18
lines changed

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

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,11 @@ abstract class AdotLambdaLayerVersion {
215215
* The collection of versions of the ADOT Lambda Layer for Java SDK
216216
*/
217217
export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
218+
/**
219+
* Version 1.32.0
220+
*/
221+
public static readonly V1_32_0_2 = new AdotLambdaLayerJavaSdkVersion('1.32.0-2');
222+
218223
/**
219224
* Version 1.32.0
220225
*/
@@ -249,7 +254,7 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
249254
* The latest layer version available in this CDK version. New versions could
250255
* introduce incompatible changes. Make sure to test them before deploying to production.
251256
*/
252-
public static readonly LATEST = this.V1_32_0_1;
257+
public static readonly LATEST = this.V1_32_0_2;
253258

254259
private constructor(protected readonly layerVersion: string) {
255260
super(AdotLambdaLayerType.JAVA_SDK, layerVersion);
@@ -260,6 +265,11 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
260265
* The collection of versions of the ADOT Lambda Layer for Java auto-instrumentation
261266
*/
262267
export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLayerVersion {
268+
/**
269+
* Version 1.32.0
270+
*/
271+
public static readonly V1_32_0_2 = new AdotLambdaLayerJavaAutoInstrumentationVersion('1.32.0-2');
272+
263273
/**
264274
* Version 1.32.0
265275
*/
@@ -294,7 +304,7 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
294304
* The latest layer version available in this CDK version. New versions could
295305
* introduce incompatible changes. Make sure to test them before deploying to production.
296306
*/
297-
public static readonly LATEST = this.V1_32_0_1;
307+
public static readonly LATEST = this.V1_32_0_2;
298308

299309
private constructor(protected readonly layerVersion: string) {
300310
super(AdotLambdaLayerType.JAVA_AUTO_INSTRUMENTATION, layerVersion);
@@ -305,6 +315,11 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
305315
* The collection of versions of the ADOT Lambda Layer for Python SDK
306316
*/
307317
export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
318+
/**
319+
* Version 1.29.0
320+
*/
321+
public static readonly V1_29_0_1 = new AdotLambdaLayerPythonSdkVersion('1.29.0-1');
322+
308323
/**
309324
* Version 1.29.0
310325
*/
@@ -374,7 +389,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
374389
* The latest layer version available in this CDK version. New versions could
375390
* introduce incompatible changes. Make sure to test them before deploying to production.
376391
*/
377-
public static readonly LATEST = this.V1_29_0;
392+
public static readonly LATEST = this.V1_29_0_1;
378393

379394
private constructor(protected readonly layerVersion: string) {
380395
super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
@@ -385,6 +400,11 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
385400
* The collection of versions of the ADOT Lambda Layer for JavaScript SDK
386401
*/
387402
export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion {
403+
/**
404+
* Version 1.30.0
405+
*/
406+
public static readonly V1_30_0_1 = new AdotLambdaLayerJavaScriptSdkVersion('1.30.0-1');
407+
388408
/**
389409
* Version 1.30.0
390410
*/
@@ -419,7 +439,7 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
419439
* The latest layer version available in this CDK version. New versions could
420440
* introduce incompatible changes. Make sure to test them before deploying to production.
421441
*/
422-
public static readonly LATEST = this.V1_30_0;
442+
public static readonly LATEST = this.V1_30_0_1;
423443

424444
private constructor(protected readonly layerVersion: string) {
425445
super(AdotLambdaLayerType.JAVASCRIPT_SDK, layerVersion);
@@ -430,6 +450,11 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
430450
* The collection of versions of the ADOT Lambda Layer for generic purpose
431451
*/
432452
export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
453+
/**
454+
* Version 0.115.0
455+
*/
456+
public static readonly V0_115_0_1 = new AdotLambdaLayerGenericVersion('0.115.0-1');
457+
433458
/**
434459
* Version 0.115.0
435460
*/
@@ -474,7 +499,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
474499
* The latest layer version available in this CDK version. New versions could
475500
* introduce incompatible changes. Make sure to test them before deploying to production.
476501
*/
477-
public static readonly LATEST = this.V0_115_0;
502+
public static readonly LATEST = this.V0_115_0_1;
478503

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

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ describe('ADOT Lambda Layer', () => {
1919
});
2020

2121
test('is added properly when the region information is available at synthesis time', () => {
22-
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0_1.layerArn(fn.stack, fn.architecture);
22+
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0_2.layerArn(fn.stack, fn.architecture);
2323

2424
expect(layerArn).toEqual(
25-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
25+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:5',
2626
);
2727
});
2828

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

3232
expect(layerArn).toEqual(
33-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
33+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:5',
3434
);
3535
});
3636
});
@@ -50,18 +50,18 @@ describe('ADOT Lambda Layer', () => {
5050
});
5151

5252
test('is added properly when the region information is available at synthesis time', () => {
53-
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0.layerArn(fn.stack, fn.architecture);
53+
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0_1.layerArn(fn.stack, fn.architecture);
5454

5555
expect(layerArn).toEqual(
56-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1',
56+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:2',
5757
);
5858
});
5959

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

6363
expect(layerArn).toEqual(
64-
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1',
64+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:2',
6565
);
6666
});
6767
});
@@ -111,7 +111,7 @@ describe('ADOT Lambda Layer', () => {
111111
{
112112
Ref: 'AWS::Region',
113113
},
114-
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:4',
114+
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:5',
115115
],
116116
],
117117
},

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,14 +3993,14 @@ describe('function', () => {
39933993
handler: 'index.handler',
39943994
runtime: lambda.Runtime.NODEJS_LATEST,
39953995
adotInstrumentation: {
3996-
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_1),
3996+
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_2),
39973997
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
39983998
},
39993999
});
40004000

40014001
// THEN
40024002
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
4003-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4'],
4003+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:5'],
40044004
Environment: {
40054005
Variables: {
40064006
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
@@ -4022,14 +4022,14 @@ describe('function', () => {
40224022
handler: 'index.handler',
40234023
runtime: lambda.Runtime.PYTHON_3_9,
40244024
adotInstrumentation: {
4025-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0),
4025+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0_1),
40264026
execWrapper: lambda.AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
40274027
},
40284028
});
40294029

40304030
// THEN
40314031
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
4032-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1'],
4032+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:2'],
40334033
Environment: {
40344034
Variables: {
40354035
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
@@ -4046,7 +4046,7 @@ describe('function', () => {
40464046
handler: 'index.handler',
40474047
runtime: lambda.Runtime.PYTHON_3_10,
40484048
adotInstrumentation: {
4049-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0),
4049+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0_1),
40504050
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
40514051
},
40524052
})).toThrow(/Python Adot Lambda layer requires AdotLambdaExecWrapper.INSTRUMENT_HANDLER/);
@@ -4065,7 +4065,7 @@ describe('function', () => {
40654065
new lambda.DockerImageFunction(stack, 'MyLambda', {
40664066
code: lambda.DockerImageCode.fromImageAsset(dockerLambdaHandlerPath),
40674067
adotInstrumentation: {
4068-
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_1),
4068+
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_2),
40694069
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
40704070
},
40714071
}),

0 commit comments

Comments
 (0)