Skip to content

fix: Handle lazy initialization by Zappa #102

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
untitaker merged 1 commit into from
Oct 3, 2018
Merged

fix: Handle lazy initialization by Zappa #102

Show file tree
Hide file tree
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
29 changes: 20 additions & 9 deletions sentry_sdk/integrations/aws_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from sentry_sdk.integrations._wsgi import _filter_headers

import __main__ as lambda_bootstrap
import runtime as lambda_runtime


class AwsLambdaIntegration(Integration):
Expand Down Expand Up @@ -46,20 +47,30 @@ def sentry_handler(event, context, *args, **kwargs):

hub.capture_event(event, hint=hint)
reraise(*exc_info)
finally:
client = hub.client
# Flush out the event queue before AWS kills the
# process. This is not threadsafe.
if client is not None:
# make new transport with empty queue
new_transport = client.transport.copy()
client.close()
client.transport = new_transport

return sentry_handler

lambda_bootstrap.make_final_handler = sentry_make_final_handler

old_report_done = lambda_runtime.report_done

def sentry_report_done(*args, **kwargs):
with capture_internal_exceptions():
hub = Hub.current
if hub is not None:
client = hub.client
# Flush out the event queue before AWS kills the
# process. This is not threadsafe.
if client is not None:
# make new transport with empty queue
new_transport = client.transport.copy()
client.close()
client.transport = new_transport

return old_report_done(*args, **kwargs)

lambda_runtime.report_done = sentry_report_done


def _make_request_event_processor(aws_event, aws_context):
def event_processor(event, hint):
Expand Down
75 changes: 54 additions & 21 deletions tests/integrations/aws_lambda/test_aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
import subprocess
import sys
import uuid
from textwrap import dedent

import pytest

boto3 = pytest.importorskip("boto3")

LAMBDA_TEMPLATE = """
LAMBDA_PRELUDE = """
from __future__ import print_function

from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
Expand All @@ -31,16 +32,12 @@ def shutdown(self, timeout, callback=None):
for event in self._queue:
print("EVENT:", json.dumps(event))

sentry_sdk.init(
"http://bogus@example.com/2",
transport=TestTransport(),
integrations=[AwsLambdaIntegration()],
**{extra_init_args}
)


def test_handler(event, context):
{code}
def init_sdk(**extra_init_args):
sentry_sdk.init(
transport=TestTransport(),
integrations=[AwsLambdaIntegration()],
**extra_init_args
)
"""


Expand All @@ -59,17 +56,13 @@ def lambda_client():

@pytest.fixture(params=["python3.6", "python2.7"])
def run_lambda_function(tmpdir, lambda_client, request, assert_semaphore_acceptance):
def inner(lambda_body, payload, extra_init_args=None):
def inner(code, payload):
runtime = request.param
tmpdir.ensure_dir("lambda_tmp").remove()
tmp = tmpdir.ensure_dir("lambda_tmp")

# https://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html
tmp.join("test_lambda.py").write(
LAMBDA_TEMPLATE.format(
code="\n".join(" " + x.strip() for x in lambda_body.splitlines()),
extra_init_args=repr(extra_init_args or {}),
)
)
tmp.join("test_lambda.py").write(code)
tmp.join("setup.cfg").write("[install]\nprefix=")
subprocess.check_call([sys.executable, "setup.py", "sdist", "-d", str(tmpdir)])
subprocess.check_call("pip install ../*.tar.gz -t .", cwd=str(tmp), shell=True)
Expand All @@ -79,7 +72,7 @@ def inner(lambda_body, payload, extra_init_args=None):

lambda_client.create_function(
FunctionName=fn_name,
Runtime=request.param,
Runtime=runtime,
Role=os.environ["AWS_IAM_ROLE"],
Handler="test_lambda.test_handler",
Code={"ZipFile": tmpdir.join("ball.zip").read(mode="rb")},
Expand Down Expand Up @@ -116,7 +109,15 @@ def delete_function():

def test_basic(run_lambda_function):
events, response = run_lambda_function(
'raise Exception("something went wrong")\n', b'{"foo": "bar"}'
LAMBDA_PRELUDE
+ dedent(
"""
init_sdk()
def test_handler(event, context):
raise Exception("something went wrong")
"""
),
b'{"foo": "bar"}',
)

assert response["FunctionError"] == "Unhandled"
Expand All @@ -139,9 +140,41 @@ def test_basic(run_lambda_function):
assert event["extra"]["lambda"]["function_name"].startswith("test_function_")


def test_initialization_order(run_lambda_function):
"""Zappa lazily imports our code, so by the time we monkeypatch the handler
as seen by AWS already runs. At this point at least draining the queue
should work."""

events, _response = run_lambda_function(
LAMBDA_PRELUDE
+ dedent(
"""
def test_handler(event, context):
init_sdk()
sentry_sdk.capture_exception(Exception("something went wrong"))
"""
),
b'{"foo": "bar"}',
)

event, = events
assert event["level"] == "error"
exception, = event["exception"]["values"]
assert exception["type"] == "Exception"
assert exception["value"] == "something went wrong"


def test_request_data(run_lambda_function):
events, _response = run_lambda_function(
'sentry_sdk.capture_message("hi")\nreturn "ok"',
LAMBDA_PRELUDE
+ dedent(
"""
init_sdk()
def test_handler(event, context):
sentry_sdk.capture_message("hi")
return "ok"
"""
),
payload=b"""
{
"resource": "/asd",
Expand Down