Add log level into binary messages for TEXT format

Author: Artem Krivonos

awslambdaric/bootstrap.py

@@ -17,8 +17,10 @@
     _DATETIME_FORMAT,
     _DEFAULT_FRAME_TYPE,
     _JSON_FRAME_TYPES,
+    _TEXT_FRAME_TYPES,
     JsonFormatter,
     LogFormat,
+    _format_log_level,
     _get_log_level_from_env_var,
 )
 from .lambda_runtime_marshaller import to_json
@@ -125,7 +127,7 @@ def log_error(error_result, log_sink):
         )
 
 else:
-    _ERROR_FRAME_TYPE = _DEFAULT_FRAME_TYPE
+    _ERROR_FRAME_TYPE = _TEXT_FRAME_TYPES[logging.ERROR]
 
     def log_error(error_result, log_sink):
         error_description = "[ERROR]"
@@ -298,9 +300,13 @@ def __init__(self, log_sink):
         self.log_sink = log_sink
 
     def emit(self, record):
-        msg = self.format(record)
-
-        self.log_sink.log(msg, frame_type=getattr(record, "_frame_type", None))
+        self.log_sink.log(
+            self.format(record),
+            frame_type=(
+                getattr(record, "_frame_type", None)
+                or _TEXT_FRAME_TYPES.get(_format_log_level(record))
+            ),
+        )
 
 
 class LambdaLoggerFilter(logging.Filter):

awslambdaric/lambda_runtime_log_utils.py

@@ -57,12 +57,24 @@ def _get_log_level_from_env_var(log_level):
     logging.ERROR: 0xA55A0016.to_bytes(4, "big"),
     logging.CRITICAL: 0xA55A001A.to_bytes(4, "big"),
 }
-_DEFAULT_FRAME_TYPE = 0xA55A0003.to_bytes(4, "big")
+_TEXT_FRAME_TYPES = {
+    logging.NOTSET: 0xA55A0003.to_bytes(4, "big"),
+    logging.DEBUG: 0xA55A000B.to_bytes(4, "big"),
+    logging.INFO: 0xA55A000F.to_bytes(4, "big"),
+    logging.WARNING: 0xA55A0013.to_bytes(4, "big"),
+    logging.ERROR: 0xA55A0017.to_bytes(4, "big"),
+    logging.CRITICAL: 0xA55A001B.to_bytes(4, "big"),
+}
+_DEFAULT_FRAME_TYPE = _TEXT_FRAME_TYPES[logging.NOTSET]
 
 _json_encoder = json.JSONEncoder(ensure_ascii=False)
 _encode_json = _json_encoder.encode
 
 
+def _format_log_level(record: logging.LogRecord):
+    return min(50, max(0, record.levelno)) // 10 * 10
+
+
 class JsonFormatter(logging.Formatter):
     def __init__(self):
         super().__init__(datefmt=_DATETIME_FORMAT)
@@ -94,13 +106,9 @@ def __format_location(record: logging.LogRecord):
 
         return f"{record.pathname}:{record.funcName}:{record.lineno}"
 
-    @staticmethod
-    def __format_log_level(record: logging.LogRecord):
-        record.levelno = min(50, max(0, record.levelno)) // 10 * 10
-        record.levelname = logging.getLevelName(record.levelno)
-
     def format(self, record: logging.LogRecord) -> str:
-        self.__format_log_level(record)
+        record.levelno = _format_log_level(record)
+        record.levelname = logging.getLevelName(record.levelno)
         record._frame_type = _JSON_FRAME_TYPES.get(
             record.levelno, _JSON_FRAME_TYPES[logging.NOTSET]
         )

tests/test_bootstrap.py

@@ -927,7 +927,7 @@ def test_log_error_framed_log_sink(self):
                 content = f.read()
 
                 frame_type = int.from_bytes(content[:4], "big")
-                self.assertEqual(frame_type, 0xA55A0003)
+                self.assertEqual(frame_type, 0xA55A0017)
 
                 length = int.from_bytes(content[4:8], "big")
                 self.assertEqual(length, len(expected_logged_error.encode("utf8")))
@@ -973,7 +973,7 @@ def test_log_error_indentation_framed_log_sink(self):
                 content = f.read()
 
                 frame_type = int.from_bytes(content[:4], "big")
-                self.assertEqual(frame_type, 0xA55A0003)
+                self.assertEqual(frame_type, 0xA55A0017)
 
                 length = int.from_bytes(content[4:8], "big")
                 self.assertEqual(length, len(expected_logged_error.encode("utf8")))
@@ -1016,7 +1016,7 @@ def test_log_error_empty_stacktrace_line_framed_log_sink(self):
                 content = f.read()
 
                 frame_type = int.from_bytes(content[:4], "big")
-                self.assertEqual(frame_type, 0xA55A0003)
+                self.assertEqual(frame_type, 0xA55A0017)
 
                 length = int.from_bytes(content[4:8], "big")
                 self.assertEqual(length, len(expected_logged_error))
@@ -1053,7 +1053,7 @@ def test_log_error_invokeId_line_framed_log_sink(self):
                 content = f.read()
 
                 frame_type = int.from_bytes(content[:4], "big")
-                self.assertEqual(frame_type, 0xA55A0003)
+                self.assertEqual(frame_type, 0xA55A0017)
 
                 length = int.from_bytes(content[4:8], "big")
                 self.assertEqual(length, len(expected_logged_error))