Merge branch 'port-5598' of github.com:port-labs/ocean into port-5598

CHANGELOG.md

@@ -7,6 +7,16 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 <!-- towncrier release notes start -->
 
+## 0.12.9 (2024-11-07)
+
+
+### Bug Fixes
+
+- Await logger writing exception on exit (Integration logs not being ingested)
+- Await logger thread on exit (Integration logs not being ingested)
+- Serialize exception (Integration logs not being ingested)
+
+
 ## 0.12.8 (2024-11-04)
 
 

integrations/gitlab/CHANGELOG.md

@@ -14,7 +14,6 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Bumped ocean version to ^0.12.8
 
-
 0.1.135 (2024-10-31)
 ====================
 

port_ocean/clients/port/mixins/integrations.py

@@ -3,7 +3,6 @@
 
 import httpx
 from loguru import logger
-
 from port_ocean.clients.port.authentication import PortAuthentication
 from port_ocean.clients.port.utils import handle_status_code
 from port_ocean.log.sensetive import sensitive_log_filter

port_ocean/log/handlers.py

@@ -11,16 +11,22 @@
 
 from port_ocean import Ocean
 from port_ocean.context.ocean import ocean
+from copy import deepcopy
+from traceback import format_exception
 
 
 def _serialize_record(record: logging.LogRecord) -> dict[str, Any]:
+    extra = {**deepcopy(record.__dict__["extra"])}
+    if isinstance(extra.get("exc_info"), Exception):
+        serialized_exception = "".join(format_exception(extra.get("exc_info")))
+        extra["exc_info"] = serialized_exception
     return {
         "message": record.msg,
         "level": record.levelname,
         "timestamp": datetime.utcfromtimestamp(record.created).strftime(
             "%Y-%m-%dT%H:%M:%S.%fZ"
         ),
-        "extra": record.__dict__["extra"],
+        "extra": extra,
     }
 
 
@@ -37,6 +43,7 @@ def __init__(
         self.flush_size = flush_size
         self.last_flush_time = time.time()
         self._serialized_buffer: list[dict[str, Any]] = []
+        self._thread_pool: list[threading.Thread] = []
 
     @property
     def ocean(self) -> Ocean | None:
@@ -46,6 +53,7 @@ def ocean(self) -> Ocean | None:
         return None
 
     def emit(self, record: logging.LogRecord) -> None:
+
         self._serialized_buffer.append(_serialize_record(record))
         super().emit(record)
 
@@ -61,6 +69,11 @@ def shouldFlush(self, record: logging.LogRecord) -> bool:
             return True
         return False
 
+    def wait_for_lingering_threads(self) -> None:
+        for thread in self._thread_pool:
+            if thread.is_alive():
+                thread.join()
+
     def flush(self) -> None:
         if self.ocean is None or not self.buffer:
             return
@@ -70,13 +83,21 @@ def _wrap_event_loop(_ocean: Ocean, logs_to_send: list[dict[str, Any]]) -> None:
             loop.run_until_complete(self.send_logs(_ocean, logs_to_send))
             loop.close()
 
+        def clear_thread_pool() -> None:
+            for thread in self._thread_pool:
+                if not thread.is_alive():
+                    self._thread_pool.remove(thread)
+
         self.acquire()
         logs = list(self._serialized_buffer)
         if logs:
             self.buffer.clear()
             self._serialized_buffer.clear()
             self.last_flush_time = time.time()
-            threading.Thread(target=_wrap_event_loop, args=(self.ocean, logs)).start()
+            clear_thread_pool()
+            thread = threading.Thread(target=_wrap_event_loop, args=(self.ocean, logs))
+            thread.start()
+            self._thread_pool.append(thread)
         self.release()
 
     async def send_logs(

port_ocean/log/logger_setup.py

@@ -55,6 +55,7 @@ def _http_loguru_handler(level: LogLevelType) -> None:
     logger.configure(patcher=exception_deserializer)
 
     http_memory_handler = HTTPMemoryHandler()
+    signal_handler.register(http_memory_handler.wait_for_lingering_threads)
     signal_handler.register(http_memory_handler.flush)
 
     queue_listener = QueueListener(queue, http_memory_handler)

port_ocean/ocean.py

@@ -123,6 +123,7 @@ async def lifecycle(_: FastAPI) -> AsyncIterator[None]:
                 yield None
             except Exception:
                 logger.exception("Integration had a fatal error. Shutting down.")
+                logger.complete()
                 sys.exit("Server stopped")
             finally:
                 signal_handler.exit()

port_ocean/tests/log/test_handlers.py

@@ -0,0 +1,71 @@
+from port_ocean.log.handlers import _serialize_record
+from loguru import logger
+from logging import LogRecord
+from queue import Queue
+from logging.handlers import QueueHandler
+from typing import Callable, Any
+
+
+log_message = "This is a test log message."
+exception_grouop_message = "Test Exception group"
+exception_message = "Test Exception"
+expected_keys = ["message", "level", "timestamp", "extra"]
+
+
+def test_serialize_record_log_shape() -> None:
+    record = log_record(
+        lambda: logger.exception(
+            log_message,
+            exc_info=None,
+        )
+    )
+    serialized_record = _serialize_record(record)
+    assert all(key in serialized_record for key in expected_keys)
+    assert log_message in serialized_record.get("message", None)
+
+
+def test_serialize_record_exc_info_single_exception() -> None:
+    record = log_record(
+        lambda: logger.exception(
+            log_message,
+            exc_info=ExceptionGroup(
+                exception_grouop_message, [Exception(exception_message)]
+            ),
+        )
+    )
+    serialized_record = _serialize_record(record)
+    exc_info = assert_extra(serialized_record.get("extra", {}))
+    assert exception_grouop_message in exc_info
+    assert exception_message in exc_info
+
+
+def test_serialize_record_exc_info_group_exception() -> None:
+    record = log_record(
+        lambda: logger.exception(log_message, exc_info=Exception(exception_message))
+    )
+    serialized_record = _serialize_record(record)
+    exc_info = assert_extra(serialized_record.get("extra", {}))
+    assert exception_message in exc_info
+
+
+def assert_extra(extra: dict[str, Any]) -> str:
+    exc_info = extra.get("exc_info", None)
+    assert type(exc_info) is str
+    return exc_info
+
+
+def log_record(cb: Callable[[], None]) -> LogRecord:
+    queue = Queue[LogRecord]()
+    queue_handler = QueueHandler(queue)
+    logger_id = logger.add(
+        queue_handler,
+        level="DEBUG",
+        format="{message}",
+        diagnose=False,
+        enqueue=True,
+    )
+    cb()
+    logger.complete()
+    logger.remove(logger_id)
+    record = queue.get()
+    return record