Skip to content

fix(awslambda): remove the unsuitable undefined type (getsentry#3364) #4362

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

Closed
wants to merge 1 commit into from
Closed

fix(awslambda): remove the unsuitable undefined type (getsentry#3364) #4362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions packages/serverless/src/awslambda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,13 @@ function enhanceScopeWithEnvironmentData(scope: Scope, context: Context, startTi
* Wraps a lambda handler adding it error capture and tracing capabilities.
*
* @param handler Handler
* @param options Options
* @param wrapOptions Options
* @returns Handler
*/
export function wrapHandler<TEvent, TResult>(
handler: Handler<TEvent, TResult>,
wrapOptions: Partial<WrapperOptions> = {},
): Handler<TEvent, TResult | undefined> {
): Handler<TEvent, TResult> {
const START_TIME = performance.now();
const options: WrapperOptions = {
flushTimeout: 2000,
Expand Down Expand Up @@ -293,12 +293,12 @@ export function wrapHandler<TEvent, TResult>(

const hub = getCurrentHub();
const scope = hub.pushScope();
let rv: TResult | undefined;

try {
enhanceScopeWithEnvironmentData(scope, context, START_TIME);
// We put the transaction on the scope so users can attach children to it
scope.setSpan(transaction);
rv = await asyncHandler(event, context);
const rv: TResult = await asyncHandler(event, context);

// We manage lambdas that use Promise.allSettled by capturing the errors of failed promises
if (options.captureAllSettledReasons && Array.isArray(rv) && isPromiseAllSettledResult(rv)) {
Expand All @@ -307,6 +307,8 @@ export function wrapHandler<TEvent, TResult>(
captureException(exception);
});
}

return rv;
} catch (e) {
captureException(e);
if (options.rethrowAfterCapture) {
Expand All @@ -318,6 +320,6 @@ export function wrapHandler<TEvent, TResult>(
hub.popScope();
await flush(options.flushTimeout);
}
return rv;
return Promise.resolve(undefined!);
};
}