Skip to content

Commit cf545ed

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into yuanhaoz/securityfix
2 parents 2967aff + e3c0764 commit cf545ed

13 files changed

Lines changed: 233 additions & 145 deletions

File tree

‎.github/workflows/closed-issue-message.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ name: Closed Issue Message
22
on:
33
issues:
44
types: [closed]
5+
pull_request_target:
6+
types: [closed]
57
jobs:
68
auto_comment:
79
permissions:
10+
pull-requests: write
811
issues: write
912
runs-on: ubuntu-latest
1013
steps:
@@ -13,7 +16,6 @@ jobs:
1316
# These inputs are both required
1417
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1518
message: |
16-
### ⚠️COMMENT VISIBILITY WARNING⚠️
17-
Comments on closed issues are hard for our team to see.
18-
If you need more assistance, please either tag a team member or open a new issue that references this one.
19+
Comments on closed issues and PRs are hard for our team to see.
20+
If you need help, please open a new issue that references this one.
1921
If you wish to keep having a conversation with other community members under this issue feel free to do so.

‎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:3"
82+
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-18-1:4"
8383
]
8484
]
8585
}
@@ -176,7 +176,7 @@
176176
{
177177
"Ref": "AWS::Region"
178178
},
179-
":901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1"
179+
":901920570463:layer:aws-otel-python-amd64-ver-1-25-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:2"
276+
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3"
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:2"
373+
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:3"
374374
]
375375
]
376376
}
@@ -467,7 +467,7 @@
467467
{
468468
"Ref": "AWS::Region"
469469
},
470-
":901920570463:layer:aws-otel-collector-amd64-ver-0-98-0:5"
470+
":901920570463:layer:aws-otel-collector-amd64-ver-0-102-1:1"
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:3"
82+
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-18-1:4"
8383
]
8484
]
8585
}
@@ -176,7 +176,7 @@
176176
{
177177
"Ref": "AWS::Region"
178178
},
179-
":901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1"
179+
":901920570463:layer:aws-otel-python-amd64-ver-1-25-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:2"
276+
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3"
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:2"
373+
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:3"
374374
]
375375
]
376376
}
@@ -467,7 +467,7 @@
467467
{
468468
"Ref": "AWS::Region"
469469
},
470-
":901920570463:layer:aws-otel-collector-amd64-ver-0-98-0:5"
470+
":901920570463:layer:aws-otel-collector-amd64-ver-0-102-1:1"
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.25.0
294+
*/
295+
public static readonly V1_25_0 = new AdotLambdaLayerPythonSdkVersion('1.25.0');
296+
292297
/**
293298
* Version 1.24.0
294299
*/
@@ -348,7 +353,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
348353
* The latest layer version available in this CDK version. New versions could
349354
* introduce incompatible changes. Make sure to test them before deploying to production.
350355
*/
351-
public static readonly LATEST = this.V1_24_0;
356+
public static readonly LATEST = this.V1_25_0;
352357

353358
private constructor(protected readonly layerVersion: string) {
354359
super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
@@ -399,6 +404,11 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
399404
* The collection of versions of the ADOT Lambda Layer for generic purpose
400405
*/
401406
export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
407+
/**
408+
* Version 0.102.1
409+
*/
410+
public static readonly V0_102_1 = new AdotLambdaLayerGenericVersion('0.102.1');
411+
402412
/**
403413
* Version 0.98.0
404414
*/
@@ -433,7 +443,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
433443
* The latest layer version available in this CDK version. New versions could
434444
* introduce incompatible changes. Make sure to test them before deploying to production.
435445
*/
436-
public static readonly LATEST = this.V0_98_0;
446+
public static readonly LATEST = this.V0_102_1;
437447

438448
private constructor(protected readonly layerVersion: string) {
439449
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:2',
27+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3',
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:2',
35+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3',
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_24_0.layerArn(fn.stack, fn.architecture);
56+
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.V1_25_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-24-0:1',
59+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-25-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-24-0:1',
67+
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-25-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:2',
117+
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:3',
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
@@ -3565,7 +3565,7 @@ describe('function', () => {
35653565

35663566
// THEN
35673567
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3568-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:2'],
3568+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:3'],
35693569
Environment: {
35703570
Variables: {
35713571
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
@@ -3587,14 +3587,14 @@ describe('function', () => {
35873587
handler: 'index.handler',
35883588
runtime: lambda.Runtime.PYTHON_3_9,
35893589
adotInstrumentation: {
3590-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_24_0),
3590+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_25_0),
35913591
execWrapper: lambda.AdotLambdaExecWrapper.INSTRUMENT_HANDLER,
35923592
},
35933593
});
35943594

35953595
// THEN
35963596
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
3597-
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-24-0:1'],
3597+
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-25-0:1'],
35983598
Environment: {
35993599
Variables: {
36003600
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
@@ -3611,7 +3611,7 @@ describe('function', () => {
36113611
handler: 'index.handler',
36123612
runtime: lambda.Runtime.PYTHON_3_10,
36133613
adotInstrumentation: {
3614-
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_24_0),
3614+
layerVersion: lambda.AdotLayerVersion.fromPythonSdkLayerVersion(lambda.AdotLambdaLayerPythonSdkVersion.V1_25_0),
36153615
execWrapper: lambda.AdotLambdaExecWrapper.REGULAR_HANDLER,
36163616
},
36173617
})).toThrow(/Python Adot Lambda layer requires AdotLambdaExecWrapper.INSTRUMENT_HANDLER/);

0 commit comments

Comments
 (0)