Handle both logged messages and objects

src/lumigo_opentelemetry/__init__.py

@@ -217,8 +217,9 @@ def init() -> Dict[str, Any]:
         def log_hook(_: Span, record: logging.LogRecord) -> None:
             from lumigo_opentelemetry.libs.json_utils import dump
 
-            scrubbed = dump(record.getMessage())
-            record.msg = scrubbed
+            record.msg = dump(
+                record.getMessage() if isinstance(record.msg, str) else record.msg
+            )
 
         # Inject the span context into logs
         LoggingInstrumentor().instrument(set_logging_format=True, log_hook=log_hook)

src/test/integration/logging/app/logging_app.py

@@ -1,4 +1,5 @@
 import json
+import os
 from opentelemetry import trace
 from lumigo_opentelemetry import logger_provider
 import logging
@@ -9,11 +10,15 @@
 logger.setLevel(logging.DEBUG)
 
 with tracer.start_as_current_span("some-span") as span:
-    logger.debug(
-        json.dumps(
-            {"some-thing": "Hello OTEL!", "some-super-secret-stuff": "this is a secret"}
-        )
-    )
+    message = {
+        "some-thing": "Hello OTEL!",
+        "some-super-secret-stuff": "this is a secret",
+    }
+
+    if os.environ["LOG_AS_JSON_STRING"] == "true":
+        logger.debug(json.dumps(message))
+    else:
+        logger.debug(message)
 
     logger_provider.force_flush()
     logger_provider.shutdown()

src/test/integration/logging/tests/test_logging.py

@@ -7,7 +7,9 @@
 from test.test_utils.logs_parser import LogsContainer
 
 
-def run_logging_app(logging_enabled: bool, log_dump_file: str = None):
+def run_logging_app(
+    logging_enabled: bool, log_dump_file: str = None, log_as_string: bool = False
+):
     app_path = path.join(
         path.dirname(path.abspath(__file__)),
         "../app/logging_app.py",
@@ -23,6 +25,7 @@ def run_logging_app(logging_enabled: bool, log_dump_file: str = None):
             "LUMIGO_DEBUG_LOGDUMP": log_dump_file
             or os.environ.get("LUMIGO_DEBUG_LOGDUMP"),
             "LUMIGO_SECRET_MASKING_REGEX": '[".*super-secret.*"]',
+            "LOG_AS_JSON_STRING": str(log_as_string).lower(),
         },
         capture_output=True,
     )
@@ -71,6 +74,28 @@ def test_logging_enabled(self):
         self.assertEqual(log_attributes["otelServiceName"], "logging-app")
         self.assertEqual(log_attributes["otelTraceSampled"], True)
 
+    def test_secret_scrubbing_string(self):
+        run_logging_app(logging_enabled=True, log_as_string=True)
+
+        logs_container = LogsContainer.get_logs_from_file()
+
+        self.assertEqual(len(logs_container), 1)
+        self.assertEqual(
+            logs_container[0]["body"],
+            '{"some-thing": "Hello OTEL!", "some-super-secret-stuff": "****"}',
+        )
+
+    def test_secret_scrubbing_object(self):
+        run_logging_app(logging_enabled=True, log_as_string=False)
+
+        logs_container = LogsContainer.get_logs_from_file()
+
+        self.assertEqual(len(logs_container), 1)
+        self.assertEqual(
+            logs_container[0]["body"],
+            '{"some-thing": "Hello OTEL!", "some-super-secret-stuff": "****"}',
+        )
+
     def test_logging_disabled(self):
         run_logging_app(logging_enabled=False)