AWS Lambda Instrumentation: Add failure safety (#268)

* Update Lambda release title

* AWS Lambda Instrumentation: Add failure safety

Author: Peter Giacomo Lombardo

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'

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.")