Skip to content

chore(maintenance): switch to unmanaged log group for functions #3014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 10, 2024
Merged

chore(maintenance): switch to unmanaged log group for functions #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3259b95
chore(maintenance): switch to unmanaged log group for functions
dreamorosi Sep 2, 2024
d810d8c
chore: fix this usage
dreamorosi Sep 2, 2024
a65cee5
Merge branch 'main' into chore/e2e_fn_loggroup
dreamorosi Sep 5, 2024
32d2f08
chore(testing): use retry options in xray trace retrieval
dreamorosi Sep 5, 2024
2dc5006
chore(testing): add debug log
dreamorosi Sep 5, 2024
e50a228
Merge branch 'main' into chore/e2e_fn_loggroup
dreamorosi Sep 10, 2024
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
20 changes: 13 additions & 7 deletions packages/testing/src/resources/TestNodejsFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
import { CfnOutput, Duration } from 'aws-cdk-lib';
import { Tracing } from 'aws-cdk-lib/aws-lambda';
import { NodejsFunction, OutputFormat } from 'aws-cdk-lib/aws-lambda-nodejs';
import { RetentionDays } from 'aws-cdk-lib/aws-logs';
import { LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
import type { TestStack } from '../TestStack.js';
import { TEST_ARCHITECTURES, TEST_RUNTIMES } from '../constants.js';
import {
Expand All @@ -25,8 +25,17 @@ class TestNodejsFunction extends NodejsFunction {
) {
const isESM = extraProps.outputFormat === 'ESM';
const { bundling, ...restProps } = props;
const functionName = concatenateResourceName({
testName: stack.testName,
resourceName: extraProps.nameSuffix,
});
const resourceId = randomUUID().substring(0, 5);

super(stack.stack, `fn-${randomUUID().substring(0, 5)}`, {
const logGroup = new LogGroup(stack.stack, `log-${resourceId}`, {
logGroupName: `/aws/lambda/${functionName}`,
retention: RetentionDays.ONE_DAY,
});
super(stack.stack, `fn-${resourceId}`, {
timeout: Duration.seconds(30),
memorySize: 512,
tracing: Tracing.ACTIVE,
Expand All @@ -41,13 +50,10 @@ class TestNodejsFunction extends NodejsFunction {
: '',
},
...restProps,
functionName: concatenateResourceName({
testName: stack.testName,
resourceName: extraProps.nameSuffix,
}),
functionName,
runtime: TEST_RUNTIMES[getRuntimeKey()],
architecture: TEST_ARCHITECTURES[getArchitectureKey()],
logRetention: RetentionDays.ONE_DAY,
logGroup,
});

new CfnOutput(this, extraProps.nameSuffix, {
Expand Down
5 changes: 2 additions & 3 deletions packages/testing/src/xray-traces-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ const getTraceIds = async (
);
}

const ids = [];

const ids: string[] = [];
for (const summary of summaries) {
if (summary.Id === undefined) {
throw new Error(
Expand Down Expand Up @@ -342,7 +341,7 @@ const getTraces = async (

const { resourceName } = options;

const mainSubsegments = [];
const mainSubsegments: EnrichedXRayTraceDocumentParsed[] = [];
for (const trace of traces) {
const mainSubsegment = findPowertoolsFunctionSegment(trace, resourceName);
const enrichedMainSubsegment = {
Expand Down
Loading