[Serve] fix missing message body for json log formats (#42729) (#42874)

ray-project · Jan 31, 2024 · fce7a36 · fce7a36
1 parent 0784b9d
commit fce7a36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/python/ray/serve/_private/logging_utils.py b/python/ray/serve/_private/logging_utils.py
@@ -81,10 +81,10 @@ def format(self, record: logging.LogRecord) -> str:
                 SERVE_LOG_APPLICATION
             ]
 
-        if SERVE_LOG_MESSAGE in record.__dict__:
-            record_format[SERVE_LOG_MESSAGE] = (
-                SERVE_LOG_RECORD_FORMAT[SERVE_LOG_MESSAGE] % record.__dict__
-            )
+        message_formatter = logging.Formatter(
+            SERVE_LOG_RECORD_FORMAT[SERVE_LOG_MESSAGE]
+        )
+        record_format[SERVE_LOG_MESSAGE] = message_formatter.format(record)
 
         if SERVE_LOG_EXTRA_FIELDS in record.__dict__:
             if not isinstance(record.__dict__[SERVE_LOG_EXTRA_FIELDS], dict):

diff --git a/python/ray/serve/tests/test_logging.py b/python/ray/serve/tests/test_logging.py
@@ -556,6 +556,12 @@ def format_and_verify_json_output(record, expected_record: dict):
         expected_json["deployment"] = "component"
         expected_json["replica"] = "component_id"
 
+    # Ensure message exists in the output.
+    # Note that there is no "message" key in the record dict until it has been
+    # formatted. This check should go before other fields are set and checked.
+    expected_json["message"] = "my_path:1 - my_message"
+    format_and_verify_json_output(record, expected_json)
+
     # Set request id
     record.request_id = "request_id"
     expected_json["request_id"] = "request_id"