feat: Add json "ensure_ascii" setting in ContainerEngineHandler

ysde · ysde · commit ae0fca5822db · 2021-02-23T14:50:48.000+08:00
To allow unicodes to show in log instead of ascii character (for example, show chinese word '哈' in log instead of '\u8bed')
diff --git a/google/cloud/logging_v2/handlers/_helpers.py b/google/cloud/logging_v2/handlers/_helpers.py
@@ -33,7 +33,7 @@
 _PROTOCOL_HEADER = "SERVER_PROTOCOL"
 
 
-def format_stackdriver_json(record, message):
+def format_stackdriver_json(record, message, json_ensure_ascii):
     """Helper to format a LogRecord in in Stackdriver fluentd format.
 
     Returns:
@@ -48,7 +48,7 @@ def format_stackdriver_json(record, message):
         "severity": record.levelname,
     }
 
-    return json.dumps(payload)
+    return json.dumps(payload, ensure_ascii=json_ensure_ascii)
 
 
 def get_request_data_from_flask():
diff --git a/google/cloud/logging_v2/handlers/container_engine.py b/google/cloud/logging_v2/handlers/container_engine.py
@@ -31,7 +31,7 @@ class ContainerEngineHandler(logging.StreamHandler):
     (GKE) fluentd plugin, so that metadata such as log level are properly set.
     """
 
-    def __init__(self, *, name=None, stream=None):
+    def __init__(self, *, name=None, stream=None, json_ensure_ascii=True):
         """
         Args:
             name (Optional[str]): The name of the custom log in Cloud Logging.
@@ -40,6 +40,7 @@ def __init__(self, *, name=None, stream=None):
         """
         super(ContainerEngineHandler, self).__init__(stream=stream)
         self.name = name
+        self.json_ensure_ascii = json_ensure_ascii
 
     def format(self, record):
         """Format the message into JSON expected by fluentd.
@@ -51,4 +52,4 @@ def format(self, record):
             str: A JSON string formatted for GKE fluentd.
         """
         message = super(ContainerEngineHandler, self).format(record)
-        return format_stackdriver_json(record, message)
+        return format_stackdriver_json(record, message, self.json_ensure_ascii)
