Fix stacktrace format (#50)

Author: alexpenev-s

sap/cf_logging/formatters/stacktrace_formatter.py

@@ -9,15 +9,15 @@
 
 def format_stacktrace(stacktrace):
     """
-    Removes newline and tab characters
+    Removes tab characters
     Truncates stacktrace to maximum size
 
     :param stacktrace: string representation of a stacktrace
     """
     if not isinstance(stacktrace, str):
         return ''
 
-    stacktrace = re.sub('\n|\t', '  ', stacktrace)
+    stacktrace = re.sub('\t', '  ', stacktrace)
 
     if len(stacktrace) <= constants.STACKTRACE_MAX_SIZE:
         return stacktrace
@@ -30,8 +30,8 @@ def format_stacktrace(stacktrace):
         stacktrace, (constants.STACKTRACE_MAX_SIZE // 3) * 2
     )
 
-    new_stacktrace = "-------- STACK TRACE TRUNCATED --------" + stacktrace_beginning +\
-                        "-------- OMITTED --------" + stacktrace_end
+    new_stacktrace = "-------- STACK TRACE TRUNCATED --------\n" + stacktrace_beginning +\
+        "-------- OMITTED --------\n" + stacktrace_end
 
     return new_stacktrace
 

sap/cf_logging/record/simple_log_record.py

@@ -72,13 +72,12 @@ def format(self):
             'logger': self.name,
             'thread': self.threadName,
             'level': self.levelname,
-            'line_no': self.lineno,
             'msg': self.getMessage(),
         })
 
         if self.levelno == logging.ERROR and self.exc_info:
             stacktrace = ''.join(traceback.format_exception(*self.exc_info))
-            record['stacktrace'] = format_stacktrace(stacktrace)
+            record['stacktrace'] = format_stacktrace(stacktrace).split('\n')
 
         record.update(self.extra)
         if len(self.custom_fields) > 0:

tests/log_schemas.py

@@ -22,7 +22,6 @@
     'logger': u.string(u.WORD),
     'thread': u.string(u.WORD),
     'level': u.enum(u.LEVEL),
-    'line_no': u.pos_num(),
     'written_at': u.iso_datetime(),
     'written_ts': u.pos_num(),
     'msg': u.string(u.WORD),

tests/unit/formatters/test_stacktrace_formatter.py

@@ -19,6 +19,6 @@ def test_stacktrace_truncated(monkeypatch):
     """ Test that stacktrace is truncated when bigger than the stacktrace maximum size """
     monkeypatch.setattr('sap.cf_logging.core.constants.STACKTRACE_MAX_SIZE', 120)
 
-    formatted = format_stacktrace(STACKTRACE)
+    formatted = ''.join(format_stacktrace(STACKTRACE))
     assert "TRUNCATED" in formatted
     assert "OMITTED" in formatted