Skip to content

AWS Lambda Instrumentation: Add failure safety #268

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 2 commits into from
Sep 21, 2020
Merged

AWS Lambda Instrumentation: Add failure safety #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085a315
Update Lambda release title
Sep 11, 2020
26c5eb5
AWS Lambda Instrumentation: Add failure safety
Sep 21, 2020
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
2 changes: 1 addition & 1 deletion bin/aws-lambda/create_lambda_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

version = sys.argv[1]
semantic_version = 'v' + version
title = "AWS Lambda Version %s" % semantic_version
title = "AWS Lambda Layer %s" % semantic_version

body = '| AWS Region | ARN |\n'
body += '| :-- | :-- |\n'
Expand Down
13 changes: 8 additions & 5 deletions instana/instrumentation/aws/lambda_inst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@ def lambda_handler_with_instana(wrapped, instance, args, kwargs):
handler_module, handler_function = get_lambda_handler_or_default()

if handler_module is not None and handler_function is not None:
logger.debug("Instrumenting AWS Lambda handler (%s.%s)" % (handler_module, handler_function))
sys.path.insert(0, '/var/runtime')
sys.path.insert(0, '/var/task')
wrapt.wrap_function_wrapper(handler_module, handler_function, lambda_handler_with_instana)
try:
logger.debug("Instrumenting AWS Lambda handler (%s.%s)" % (handler_module, handler_function))
sys.path.insert(0, '/var/runtime')
sys.path.insert(0, '/var/task')
wrapt.wrap_function_wrapper(handler_module, handler_function, lambda_handler_with_instana)
except (ModuleNotFoundError, ImportError) as exc:
logger.warning("Instana: Couldn't instrument AWS Lambda handler. Not monitoring.")
else:
logger.debug("Couldn't determine AWS Lambda Handler. Not monitoring.")
logger.warning("Instana: Couldn't determine AWS Lambda Handler. Not monitoring.")