Skip to content

Commit bb4d438

Browse files
committed
Update the fact tables and tests for lambda layers v0.115.0
1 parent c57debb commit bb4d438

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
@@ -214,6 +214,11 @@ abstract class AdotLambdaLayerVersion {
214214
* The collection of versions of the ADOT Lambda Layer for Java SDK
215215
*/
216216
export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
217+
/**
218+
* Version 1.32.1
219+
*/
220+
public static readonly V1_32_0_1 = new AdotLambdaLayerJavaSdkVersion('1.32.1');
221+
217222
/**
218223
* Version 1.32.0
219224
*/
@@ -243,7 +248,7 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
243248
* The latest layer version available in this CDK version. New versions could
244249
* introduce incompatible changes. Make sure to test them before deploying to production.
245250
*/
246-
public static readonly LATEST = this.V1_32_0;
251+
public static readonly LATEST = this.V1_32_0_1;
247252

248253
private constructor(protected readonly layerVersion: string) {
249254
super(AdotLambdaLayerType.JAVA_SDK, layerVersion);
@@ -254,6 +259,11 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
254259
* The collection of versions of the ADOT Lambda Layer for Java auto-instrumentation
255260
*/
256261
export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLayerVersion {
262+
/**
263+
* Version 1.32.0
264+
*/
265+
public static readonly V1_32_0_1 = new AdotLambdaLayerJavaAutoInstrumentationVersion('1.32.0-1');
266+
257267
/**
258268
* Version 1.32.0
259269
*/
@@ -283,7 +293,7 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
283293
* The latest layer version available in this CDK version. New versions could
284294
* introduce incompatible changes. Make sure to test them before deploying to production.
285295
*/
286-
public static readonly LATEST = this.V1_32_0;
296+
public static readonly LATEST = this.V1_32_0_1;
287297

288298
private constructor(protected readonly layerVersion: string) {
289299
super(AdotLambdaLayerType.JAVA_AUTO_INSTRUMENTATION, layerVersion);
@@ -294,6 +304,11 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
294304
* The collection of versions of the ADOT Lambda Layer for Python SDK
295305
*/
296306
export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
307+
/**
308+
* Version 1.29.0
309+
*/
310+
public static readonly V1_29_0 = new AdotLambdaLayerPythonSdkVersion('1.29.0');
311+
297312
/**
298313
* Version 1.25.0
299314
*/
@@ -358,7 +373,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
358373
* The latest layer version available in this CDK version. New versions could
359374
* introduce incompatible changes. Make sure to test them before deploying to production.
360375
*/
361-
public static readonly LATEST = this.V1_25_0;
376+
public static readonly LATEST = this.V1_29_0;
362377

363378
private constructor(protected readonly layerVersion: string) {
364379
super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
@@ -369,6 +384,11 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
369384
* The collection of versions of the ADOT Lambda Layer for JavaScript SDK
370385
*/
371386
export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion {
387+
/**
388+
* Version 1.30.0
389+
*/
390+
public static readonly V1_30_0 = new AdotLambdaLayerJavaScriptSdkVersion('1.30.0');
391+
372392
/**
373393
* Version 1.18.1
374394
*/
@@ -398,7 +418,7 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
398418
* The latest layer version available in this CDK version. New versions could
399419
* introduce incompatible changes. Make sure to test them before deploying to production.
400420
*/
401-
public static readonly LATEST = this.V1_18_1;
421+
public static readonly LATEST = this.V1_30_0;
402422

403423
private constructor(protected readonly layerVersion: string) {
404424
super(AdotLambdaLayerType.JAVASCRIPT_SDK, layerVersion);
@@ -409,6 +429,11 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
409429
* The collection of versions of the ADOT Lambda Layer for generic purpose
410430
*/
411431
export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
432+
/**
433+
* Version 0.115.0
434+
*/
435+
public static readonly V0_115_0 = new AdotLambdaLayerGenericVersion('0.115.0');
436+
412437
/**
413438
* Version 0.102.1
414439
*/
@@ -448,7 +473,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
448473
* The latest layer version available in this CDK version. New versions could
449474
* introduce incompatible changes. Make sure to test them before deploying to production.
450475
*/
451-
public static readonly LATEST = this.V0_102_1;
476+
public static readonly LATEST = this.V0_115_0;
452477

453478
private constructor(protected readonly layerVersion: string) {
454479
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
@@ -21,18 +21,18 @@ describe('ADOT Lambda Layer', () => {
2121
});
2222

2323
test('is added properly when the region information is available at synthesis time', () => {
24-
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0.layerArn(fn.stack, fn.architecture);
24+
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0_1.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:3',
27+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
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:3',
35+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
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_25_0.layerArn(fn.stack, fn.architecture);
56+
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_29_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-25-0:1',
59+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-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-25-0:1',
67+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-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:3',
117+
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:4',
118118
],
119119
],
120120
},

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3725,14 +3725,14 @@ describe('function', () => {
37253725
handler: 'index.handler',
37263726
runtime: lambda.Runtime.NODEJS_LATEST,
37273727
adotInstrumentation: {
3728-
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0),
3728+
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_1),
37293729
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
37303730
},
37313731
});
37323732

37333733
// THEN
37343734
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3735-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3'],
3735+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4'],
37363736
Environment: {
37373737
Variables: {
37383738
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
@@ -3754,14 +3754,14 @@ describe('function', () => {
37543754
handler: 'index.handler',
37553755
runtime: lambda.Runtime.PYTHON_3_9,
37563756
adotInstrumentation: {
3757-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_25_0),
3757+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0),
37583758
execWrapper: lambda.AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
37593759
},
37603760
});
37613761

37623762
// THEN
37633763
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3764-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-25-0:1'],
3764+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1'],
37653765
Environment: {
37663766
Variables: {
37673767
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
@@ -3778,7 +3778,7 @@ describe('function', () => {
37783778
handler: 'index.handler',
37793779
runtime: lambda.Runtime.PYTHON_3_10,
37803780
adotInstrumentation: {
3781-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_25_0),
3781+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_29_0),
37823782
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
37833783
},
37843784
})).toThrow(/Python Adot Lambda layer requires AdotLambdaExecWrapper.INSTRUMENT_HANDLER/);
@@ -3797,7 +3797,7 @@ describe('function', () => {
37973797
new lambda.DockerImageFunction(stack, 'MyLambda', {
37983798
code: lambda.DockerImageCode.fromImageAsset(dockerLambdaHandlerPath),
37993799
adotInstrumentation: {
3800-
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0),
3800+
layerVersion: lambda.AdotLayerVersion.fromJavaSdkLayerVersion(AdotLambdaLayerJavaSdkVersion.V1_32_0_1),
38013801
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
38023802
},
38033803
}),

0 commit comments

Comments
 (0)