Lambda error log fix (#334)

* added logging of the lambda error including the traceback

* fix for sqlalchemy, context can be None, we should avoid firing an exception

Author: pdimitra

instana/instrumentation/aws/lambda_inst.py

@@ -12,6 +12,7 @@
 from ... import get_lambda_handler_or_default
 from ...singletons import get_agent, get_tracer
 from .triggers import enrich_lambda_span, get_context
+import traceback
 
 
 def lambda_handler_with_instana(wrapped, instance, args, kwargs):
@@ -36,6 +37,7 @@ def lambda_handler_with_instana(wrapped, instance, args, kwargs):
                     result['multiValueHeaders']['Server-Timing'] = [server_timing_value]
         except Exception as exc:
             if scope.span:
+                exc = traceback.format_exc()
                 scope.span.log_exception(exc)
             raise
         finally:

instana/instrumentation/sqlalchemy.py

@@ -28,7 +28,8 @@ def receive_before_cursor_execute(**kw):
 
             scope = active_tracer.start_active_span("sqlalchemy", child_of=active_tracer.active_span)
             context = kw['context']
-            context._stan_scope = scope
+            if context:
+                context._stan_scope = scope
 
             conn = kw['conn']
             url = str(conn.engine.url)

instana/span.py

@@ -64,7 +64,6 @@ def log_exception(self, exc):
         try:
             message = ""
             self.mark_as_errored()
-
             if hasattr(exc, '__str__') and len(str(exc)) > 0:
                 message = str(exc)
             elif hasattr(exc, 'message') and exc.message is not None:
@@ -84,6 +83,8 @@ def log_exception(self, exc):
                 self.set_tag('error', message)
             elif self.operation_name == "sqlalchemy":
                 self.set_tag('sqlalchemy.err', message)
+            elif self.operation_name == "aws.lambda.entry":
+                self.set_tag('lambda.error', message)
             else:
                 self.log_kv({'message': message})
         except Exception:
@@ -295,7 +296,7 @@ def _populate_entry_span_data(self, span):
             self.data["lambda"]["functionName"] = span.tags.pop('lambda.name', "Unknown")
             self.data["lambda"]["functionVersion"] = span.tags.pop('lambda.version', "Unknown")
             self.data["lambda"]["trigger"] = span.tags.pop('lambda.trigger', None)
-            self.data["lambda"]["error"] = None
+            self.data["lambda"]["error"] = span.tags.pop('lambda.error', None)
 
             trigger_type = self.data["lambda"]["trigger"]
 

instana/version.py

@@ -3,4 +3,4 @@
 
 # Module version file.  Used by setup.py and snapshot reporting.
 
-VERSION = '1.35.1'
+VERSION = '1.35.2'