From fa24c54ecf74e11d4172c349c66a8be551670ce0 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 16 May 2024 17:25:17 +0200 Subject: [PATCH] fix(aws-serverless): Fix build for lambda layer --- packages/aws-serverless/rollup.aws.config.mjs | 1 + packages/aws-serverless/src/awslambda-auto.ts | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/aws-serverless/rollup.aws.config.mjs b/packages/aws-serverless/rollup.aws.config.mjs index 22656f397140..6f5cc7d581e5 100644 --- a/packages/aws-serverless/rollup.aws.config.mjs +++ b/packages/aws-serverless/rollup.aws.config.mjs @@ -15,6 +15,7 @@ export default [ sourcemap: false, }, }, + preserveModules: false, }), // We only need one copy of the SDK, and we pick the minified one because there's a cap on how big a lambda function // plus its dependencies can be, and we might as well take up as little of that space as is necessary. We'll rename diff --git a/packages/aws-serverless/src/awslambda-auto.ts b/packages/aws-serverless/src/awslambda-auto.ts index 6deb405ba505..9cf3ba68ae6e 100644 --- a/packages/aws-serverless/src/awslambda-auto.ts +++ b/packages/aws-serverless/src/awslambda-auto.ts @@ -1,5 +1,4 @@ -import { getDefaultIntegrations as getNodeDefaultIntegrations } from '@sentry/node'; -import { init, tryPatchHandler } from './sdk'; +import * as Sentry from './index'; const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT; if (lambdaTaskRoot) { @@ -8,12 +7,12 @@ if (lambdaTaskRoot) { throw Error(`LAMBDA_TASK_ROOT is non-empty(${lambdaTaskRoot}) but _HANDLER is not set`); } - init({ + Sentry.init({ // We want to load the performance integrations here, if the tracesSampleRate is set for the layer in env vars // Sentry node's `getDefaultIntegrations` will load them if tracing is enabled, // which is the case if `tracesSampleRate` is set. // We can safely add all the node default integrations - integrations: getNodeDefaultIntegrations( + integrations: Sentry.getDefaultIntegrations( process.env.SENTRY_TRACES_SAMPLE_RATE ? { tracesSampleRate: parseFloat(process.env.SENTRY_TRACES_SAMPLE_RATE), @@ -22,7 +21,7 @@ if (lambdaTaskRoot) { ), }); - tryPatchHandler(lambdaTaskRoot, handlerString); + Sentry.tryPatchHandler(lambdaTaskRoot, handlerString); } else { throw Error('LAMBDA_TASK_ROOT environment variable is not set'); }