From 085a3150e6d58682415a5f07fe7cc8c17e717798 Mon Sep 17 00:00:00 2001 From: Peter Giacomo Lombardo Date: Fri, 11 Sep 2020 15:53:35 +0200 Subject: [PATCH 1/2] Update Lambda release title --- bin/aws-lambda/create_lambda_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/aws-lambda/create_lambda_release.py b/bin/aws-lambda/create_lambda_release.py index feef49c1..75b17812 100755 --- a/bin/aws-lambda/create_lambda_release.py +++ b/bin/aws-lambda/create_lambda_release.py @@ -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' From 26c5eb5c035d21b886321a66bce0df1e483aee92 Mon Sep 17 00:00:00 2001 From: Peter Giacomo Lombardo Date: Mon, 21 Sep 2020 16:44:34 +0200 Subject: [PATCH 2/2] AWS Lambda Instrumentation: Add failure safety --- instana/instrumentation/aws/lambda_inst.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/instana/instrumentation/aws/lambda_inst.py b/instana/instrumentation/aws/lambda_inst.py index 772e7214..6bab489a 100644 --- a/instana/instrumentation/aws/lambda_inst.py +++ b/instana/instrumentation/aws/lambda_inst.py @@ -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.")