Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-2:2"
]
]
}
Expand Down Expand Up @@ -176,7 +176,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1"
":901920570463:layer:aws-otel-python-amd64-ver-1-32-0:3"
]
]
}
Expand Down Expand Up @@ -273,7 +273,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4"
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:7"
]
]
}
Expand Down Expand Up @@ -370,7 +370,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:4"
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:7"
]
]
}
Expand Down Expand Up @@ -467,7 +467,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-collector-amd64-ver-0-115-0:2"
":901920570463:layer:aws-otel-collector-amd64-ver-0-151-0:1"
]
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-2:2"
]
]
}
Expand Down Expand Up @@ -176,7 +176,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1"
":901920570463:layer:aws-otel-python-amd64-ver-1-32-0:3"
]
]
}
Expand Down Expand Up @@ -273,7 +273,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4"
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:7"
]
]
}
Expand Down Expand Up @@ -370,7 +370,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:4"
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-32-0:7"
]
]
}
Expand Down Expand Up @@ -467,7 +467,7 @@
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-collector-amd64-ver-0-115-0:2"
":901920570463:layer:aws-otel-collector-amd64-ver-0-151-0:1"
]
]
}
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Updated ADOT layer versions: Java SDK/Agent 1.32.0-2, JavaScript 1.30.2, Python 1.32.0, Generic 0.151.0
import * as cdk from 'aws-cdk-lib';
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
import type { Construct } from 'constructs';
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-lambda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ The legacy helper functions for the `layerVersion` prop are:
* `AdotLayerVersion.fromJavaAutoInstrumentationSdkLayerVersion`
* `AdotLayerVersion.fromGenericSdkLayerVersion`

Each helper function expects a version value from a corresponding enum-like class as below:
Each helper function expects a version value from a corresponding enum-like class as below (latest versions as of ADOT Collector v0.48.0):

* `AdotLambdaLayerJavaScriptSdkVersion`
* `AdotLambdaLayerPythonSdkVersion`
Expand Down
50 changes: 45 additions & 5 deletions packages/aws-cdk-lib/aws-lambda/lib/adot-layers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
/**
* Version 1.32.0
*/
/**
* Version 1.32.0-2 (CVE remediation, ADOT Collector v0.48.0)
*/
public static readonly V1_32_0_2 = new AdotLambdaLayerJavaSdkVersion('1.32.0-2');

/**
* Version 1.32.0-1
*/
public static readonly V1_32_0_1 = new AdotLambdaLayerJavaSdkVersion('1.32.0-1');

/**
Expand Down Expand Up @@ -268,7 +276,7 @@ export class AdotLambdaLayerJavaSdkVersion extends AdotLambdaLayerVersion {
* The latest layer version available in this CDK version. New versions could
* introduce incompatible changes. Make sure to test them before deploying to production.
*/
public static readonly LATEST = this.V1_32_0_1;
public static readonly LATEST = this.V1_32_0_2;

private constructor(protected readonly layerVersion: string) {
super(AdotLambdaLayerType.JAVA_SDK, layerVersion);
Expand All @@ -284,6 +292,14 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
/**
* Version 1.32.0
*/
/**
* Version 1.32.0-2 (CVE remediation, ADOT Collector v0.48.0)
*/
public static readonly V1_32_0_2 = new AdotLambdaLayerJavaAutoInstrumentationVersion('1.32.0-2');

/**
* Version 1.32.0-1
*/
public static readonly V1_32_0_1 = new AdotLambdaLayerJavaAutoInstrumentationVersion('1.32.0-1');

/**
Expand Down Expand Up @@ -315,7 +331,7 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
* The latest layer version available in this CDK version. New versions could
* introduce incompatible changes. Make sure to test them before deploying to production.
*/
public static readonly LATEST = this.V1_32_0_1;
public static readonly LATEST = this.V1_32_0_2;

private constructor(protected readonly layerVersion: string) {
super(AdotLambdaLayerType.JAVA_AUTO_INSTRUMENTATION, layerVersion);
Expand All @@ -328,6 +344,14 @@ export class AdotLambdaLayerJavaAutoInstrumentationVersion extends AdotLambdaLay
* **Note:** These are legacy ADOT Lambda layers with an embedded collector.
*/
export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
/**
* Version 1.29.0
*/
/**
* Version 1.32.0 (CVE remediation, ADOT Collector v0.48.0)
*/
public static readonly V1_32_0 = new AdotLambdaLayerPythonSdkVersion('1.32.0');

/**
* Version 1.29.0
*/
Expand Down Expand Up @@ -397,7 +421,7 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
* The latest layer version available in this CDK version. New versions could
* introduce incompatible changes. Make sure to test them before deploying to production.
*/
public static readonly LATEST = this.V1_29_0;
public static readonly LATEST = this.V1_32_0;

private constructor(protected readonly layerVersion: string) {
super(AdotLambdaLayerType.PYTHON_SDK, layerVersion);
Expand All @@ -410,6 +434,14 @@ export class AdotLambdaLayerPythonSdkVersion extends AdotLambdaLayerVersion {
* **Note:** These are legacy ADOT Lambda layers with an embedded collector.
*/
export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion {
/**
* Version 1.30.0
*/
/**
* Version 1.30.2 (CVE remediation, ADOT Collector v0.48.0)
*/
public static readonly V1_30_2 = new AdotLambdaLayerJavaScriptSdkVersion('1.30.2');

/**
* Version 1.30.0
*/
Expand Down Expand Up @@ -444,7 +476,7 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
* The latest layer version available in this CDK version. New versions could
* introduce incompatible changes. Make sure to test them before deploying to production.
*/
public static readonly LATEST = this.V1_30_0;
public static readonly LATEST = this.V1_30_2;

private constructor(protected readonly layerVersion: string) {
super(AdotLambdaLayerType.JAVASCRIPT_SDK, layerVersion);
Expand All @@ -457,6 +489,14 @@ export class AdotLambdaLayerJavaScriptSdkVersion extends AdotLambdaLayerVersion
* **Note:** These are legacy ADOT Lambda layers with an embedded collector.
*/
export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
/**
* Version 0.115.0
*/
/**
* Version 0.151.0 (CVE remediation, Go 1.26.2)
*/
public static readonly V0_151_0 = new AdotLambdaLayerGenericVersion('0.151.0');

/**
* Version 0.115.0
*/
Expand Down Expand Up @@ -501,7 +541,7 @@ export class AdotLambdaLayerGenericVersion extends AdotLambdaLayerVersion {
* The latest layer version available in this CDK version. New versions could
* introduce incompatible changes. Make sure to test them before deploying to production.
*/
public static readonly LATEST = this.V0_115_0;
public static readonly LATEST = this.V0_151_0;

private constructor(protected readonly layerVersion: string) {
super(AdotLambdaLayerType.GENERIC, layerVersion);
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk-lib/aws-lambda/test/adot.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ describe('ADOT Lambda Layer', () => {
const layerArn = lambda.AdotLambdaLayerJavaSdkVersion.V1_32_0_1.layerArn(fn.stack, fn.architecture);

expect(layerArn).toEqual(
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:7',
);
});

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

expect(layerArn).toEqual(
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4',
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:7',
);
});
});
Expand Down Expand Up @@ -61,7 +61,7 @@ describe('ADOT Lambda Layer', () => {
const layerArn = lambda.AdotLambdaLayerPythonSdkVersion.LATEST.layerArn(fn.stack, fn.architecture);

expect(layerArn).toEqual(
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1',
'arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-32-0:3',
);
});
});
Expand Down Expand Up @@ -111,7 +111,7 @@ describe('ADOT Lambda Layer', () => {
{
Ref: 'AWS::Region',
},
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:4',
':901920570463:layer:aws-otel-java-wrapper-arm64-ver-1-32-0:7',
],
],
},
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/aws-lambda/test/function.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4234,7 +4234,7 @@ describe('function', () => {

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:4'],
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-32-0:7'],
Environment: {
Variables: {
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-handler',
Expand Down Expand Up @@ -4263,7 +4263,7 @@ describe('function', () => {

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', {
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-29-0:1'],
Layers: ['arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python-amd64-ver-1-32-0:3'],
Environment: {
Variables: {
AWS_LAMBDA_EXEC_WRAPPER: '/opt/otel-instrument',
Expand Down
Loading
Loading