Optionally sends entire record as JSON instead of only message

logging_loki/emitter.py

@@ -3,6 +3,7 @@
 import abc
 import copy
 import functools
+import json
 import logging
 import time
 from logging.config import ConvertingDict
@@ -30,7 +31,7 @@ class LokiEmitter(abc.ABC):
     label_replace_with = const.label_replace_with
     session_class = requests.Session
 
-    def __init__(self, url: str, tags: Optional[dict] = None, auth: BasicAuth = None):
+    def __init__(self, url: str, tags: Optional[dict] = None, auth: BasicAuth = None, as_json=False):
         """
         Create new Loki emitter.
 
@@ -46,6 +47,8 @@ def __init__(self, url: str, tags: Optional[dict] = None, auth: BasicAuth = None
         self.url = url
         #: Optional tuple with username and password for basic authentication.
         self.auth = auth
+        #: Optional bool, send record as json?
+        self.as_json = as_json
 
         self._session: Optional[requests.Session] = None
 
@@ -136,6 +139,9 @@ def build_payload(self, record: logging.LogRecord, line) -> dict:
         labels = self.build_tags(record)
         ns = 1e9
         ts = str(int(time.time() * ns))
+
+        line = json.dumps(record, default=lambda obj: obj.__dict__) if self.as_json else line
+
         stream = {
             "stream": labels,
             "values": [[ts, line]],

logging_loki/handlers.py

@@ -42,6 +42,7 @@ def __init__(
         tags: Optional[dict] = None,
         auth: Optional[emitter.BasicAuth] = None,
         version: Optional[str] = None,
+        as_json: Optional[bool] = False
     ):
         """
         Create new Loki logging handler.
@@ -67,7 +68,7 @@ def __init__(
         version = version or const.emitter_ver
         if version not in self.emitters:
             raise ValueError("Unknown emitter version: {0}".format(version))
-        self.emitter = self.emitters[version](url, tags, auth)
+        self.emitter = self.emitters[version](url, tags, auth, as_json)
 
     def handleError(self, record):  # noqa: N802
         """Close emitter and let default handler take actions on error."""