Add support for exceptions

mikeadamz · mikeadamz · commit c57e6f60ceda · 2018-12-01T15:20:48.000-08:00
diff --git a/json_logging/__init__.py b/json_logging/__init__.py
@@ -3,6 +3,7 @@
 import logging
 import uuid
 from datetime import datetime
+import traceback
 
 from json_logging import util
 from json_logging.framework_base import RequestAdapter, ResponseAdapter, AppRequestInstrumentationConfigurator, \
@@ -225,6 +226,21 @@ class JSONLogFormatter(logging.Formatter):
     Formatter for non-web application log
     """
 
+    def get_exc_fields(self, record):
+        if record.exc_info:
+            exc_info = self.format_exception(record.exc_info)
+        else:
+            exc_info = record.exc_text
+        return {
+            'exc_info': exc_info,
+            'filename': record.filename,
+        }
+
+    @classmethod
+    def format_exception(cls, exc_info):
+
+        return ''.join(traceback.format_exception(*exc_info)) if exc_info else ''
+
     def format(self, record):
         utcnow = datetime.utcnow()
         json_log_object = {"type": "log",
@@ -237,13 +253,15 @@ def format(self, record):
                            "thread": record.threadName,
                            "level": record.levelname,
                            "module": record.module,
-                           "line_no": record.lineno,
-                           "msg": record.getMessage()
+                           "msg": record.getMessage(),
                            }
 
         if hasattr(record, 'props'):
             json_log_object.update(record.props)
 
+        if record.exc_info or record.exc_text:
+            json_log_object.update(self.get_exc_fields(record))
+
         return JSON_SERIALIZER(json_log_object)
 
 
@@ -252,6 +270,21 @@ class JSONLogWebFormatter(logging.Formatter):
     Formatter for web application log
     """
 
+    def get_exc_fields(self, record):
+        if record.exc_info:
+            exc_info = self.format_exception(record.exc_info)
+        else:
+            exc_info = record.exc_text
+        return {
+            'exc_info': exc_info,
+            'filename': record.filename,
+        }
+
+    @classmethod
+    def format_exception(cls, exc_info):
+
+        return ''.join(traceback.format_exception(*exc_info)) if exc_info else ''
+
     def format(self, record):
         utcnow = datetime.utcnow()
         json_log_object = {"type": "log",
@@ -272,6 +305,9 @@ def format(self, record):
         if hasattr(record, 'props'):
             json_log_object.update(record.props)
 
+        if hasattr(record, 'exc_info') or hasattr(record, 'exc_text'):
+            json_log_object.update(self.get_exc_fields(record))
+
         return JSON_SERIALIZER(json_log_object)
 
 
