Skip to content

feat(aws-lambda-integration): Prepare AWS lambda import for v8 SDK #70137

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 1 commit into from
May 3, 2024
Merged

feat(aws-lambda-integration): Prepare AWS lambda import for v8 SDK #70137

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
30 changes: 27 additions & 3 deletions src/sentry/integrations/aws_lambda/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import re
from functools import wraps

import sentry_sdk
from django.conf import settings
from django.core.cache import cache
from django.utils.translation import gettext_lazy as _
Expand Down Expand Up @@ -225,9 +226,32 @@ def enable_single_lambda(lambda_client, function, sentry_project_dsn, retries_le

if runtime.startswith("nodejs"):
# note the env variables would be different for non-Node runtimes
env_variables.update(
{"NODE_OPTIONS": "-r @sentry/serverless/dist/awslambda-auto", **sentry_env_variables}
)
version = get_option_value(function, OPTION_VERSION)
try:
parsed_version = int(version)
except Exception:
sentry_sdk.capture_message("Invariant: Unable to parse AWS lambda version")
parsed_version = None

if (
# Lambda layer version 235 was the latest version using `@sentry/serverless` before we switched to `@sentry/aws-serverless`
Copy link
Member

Choose a reason for hiding this comment

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

Reminds me that we once thought about creating some kind of public mapping between layer version and SDK version. We should probably revisit this

parsed_version is not None
and parsed_version <= 235
):
env_variables.update(
{
"NODE_OPTIONS": "-r @sentry/serverless/dist/awslambda-auto",
**sentry_env_variables,
}
)
else:
env_variables.update(
{
"NODE_OPTIONS": "-r @sentry/aws-serverless/cjs/awslambda-auto",
**sentry_env_variables,
}
)

elif runtime.startswith("python"):
# Check if we are trying to re-enable an already enabled python, and if
# are we should not override the env variable "SENTRY_INITIAL_HANDLER"
Expand Down