Skip to content

ref(aws-serverless): Add type to captured event mechanism #17248

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 4 commits into from
Aug 4, 2025
Merged

ref(aws-serverless): Add type to captured event mechanism #17248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83cd0d5
ref(aws-serverless): Add `type` to captured event `mechanism`
Lms24 Jul 31, 2025
e695b87
fix test
Lms24 Jul 31, 2025
b30d21d
remove optional param
Lms24 Jul 31, 2025
b0c48e3
update to trace origin-esque naming
Lms24 Aug 1, 2025
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
4 changes: 2 additions & 2 deletions packages/aws-serverless/src/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,11 @@ export function wrapHandler<TEvent, TResult>(
if (options.captureAllSettledReasons && Array.isArray(rv) && isPromiseAllSettledResult(rv)) {
const reasons = getRejectedReasons(rv);
reasons.forEach(exception => {
captureException(exception, scope => markEventUnhandled(scope));
captureException(exception, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.promise'));
});
}
} catch (e) {
captureException(e, scope => markEventUnhandled(scope));
captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.handler'));
throw e;
} finally {
clearTimeout(timeoutWarningTimer);
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-serverless/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const headerGetter: TextMapGetter<APIGatewayProxyEventHeaders> = {
/**
* Marks an event as unhandled by adding a span processor to the passed scope.
*/
export function markEventUnhandled(scope: Scope): Scope {
export function markEventUnhandled(scope: Scope, type: string): Scope {
scope.addEventProcessor(event => {
addExceptionMechanism(event, { handled: false });
addExceptionMechanism(event, { handled: false, type });
return event;
});

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/test/sdk.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ describe('AWSLambda', () => {
// @ts-expect-error just mocking around...
expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
handled: false,
type: 'generic',
type: 'auto.function.aws-serverless.handler',
Copy link
Member Author

@Lms24 Lms24 Aug 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adjusted the types to follow trace origin. It's not 100% identical to the span origin because for the span it's auto.function.serverless. However, I think we might wanna adjust that to .aws-serverless as the current one is likely a leftover of @sentry/serverless.

});
}
});
Expand Down
Loading