fastapi-observer 1.3.1__tar.gz → 1.3.2__tar.gz

{fastapi_observer-1.3.1/src/fastapi_observer.egg-info → fastapi_observer-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-observer
-Version: 1.3.1
+Version: 1.3.2
 Summary: Zero-glue FastAPI observability with security presets and runtime controls
 Author-email: Vitaee <opensource@vitaee.dev>
 License-Expression: MIT

{fastapi_observer-1.3.1 → fastapi_observer-1.3.2/src/fastapi_observer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-observer
-Version: 1.3.1
+Version: 1.3.2
 Summary: Zero-glue FastAPI observability with security presets and runtime controls
 Author-email: Vitaee <opensource@vitaee.dev>
 License-Expression: MIT

{fastapi_observer-1.3.1 → fastapi_observer-1.3.2}/src/fastapi_observer.egg-info/SOURCES.txt

@@ -85,6 +85,7 @@ tests/test_db_tracing.py
 tests/test_dx_parity.py
 tests/test_excluded_url_precedence.py
 tests/test_fastapi_install.py
+tests/test_fork_queue_listener.py
 tests/test_graphql_integrations.py
 tests/test_lifespan_teardown.py
 tests/test_log_queue_controls.py

fastapi_observer-1.3.2/src/fastapiobserver/_version.py

@@ -0,0 +1 @@
+__version__ = "1.3.2"

{fastapi_observer-1.3.1 → fastapi_observer-1.3.2}/src/fastapiobserver/fastapi.py

@@ -213,6 +213,9 @@ def _auto_discover_excluded_routes(app: FastAPI, settings: ObservabilitySettings
     """Auto-discover routes like /docs, /openapi.json, or include_in_schema=False."""
     # Build a set of paths to exclude
     excluded = set(settings.metrics_exclude_paths)
+    if settings.metrics_path:
+        excluded.update(_build_exclude_path_variants(settings.metrics_path))
+
     for route in app.routes:
         path = getattr(route, "path", None)
         if not path:
@@ -233,7 +236,10 @@ def _auto_discover_excluded_routes(app: FastAPI, settings: ObservabilitySettings
         while hasattr(current, "app"):
             # Check by name since we don't want a hard dependency
             if current.__class__.__name__ == "OpenTelemetryMiddleware":
-                from opentelemetry.util.http import parse_excluded_urls
+                try:
+                    from opentelemetry.util.http import parse_excluded_urls
+                except ImportError:
+                    break
 
                 current_excluded: set[str] = set()
                 for attr_name in ("excluded_urls", "_excluded_urls"):
@@ -293,10 +299,7 @@ def _register_logging_shutdown_hook(app: FastAPI) -> None:
     async def auto_observability_lifespan(
         app_inst: FastAPI,
     ) -> typing.AsyncGenerator[typing.Any, None]:
-        if hasattr(app_inst.state, "_observability_settings"):
-            _auto_discover_excluded_routes(app_inst, app_inst.state._observability_settings)
-
-        try:
+        async with observability_lifespan(app_inst):
             if original_lifespan:
                 # If the user is explicitly using observability_lifespan inside their
                 # original_lifespan, this will safely no-op during cleanup because
@@ -305,8 +308,6 @@ def _register_logging_shutdown_hook(app: FastAPI) -> None:
                     yield state
             else:
                 yield {}
-        finally:
-            _teardown_observability(app_inst)
 
     app.router.lifespan_context = auto_observability_lifespan
     _REGISTERED_APPS.add(app)

{fastapi_observer-1.3.1 → fastapi_observer-1.3.2}/src/fastapiobserver/logging/setup.py

@@ -193,6 +193,7 @@ def setup_logging(
         state._QUEUE_LISTENER = listener
         state._MANAGED_OUTPUT_HANDLERS = managed_output_handlers
         _ensure_atexit_shutdown_hook_locked()
+        _ensure_fork_reinitialization_locked()
 
         for name in ("uvicorn", "uvicorn.error", "uvicorn.access"):
             uvicorn_logger = logging.getLogger(name)
@@ -217,6 +218,56 @@ def _ensure_atexit_shutdown_hook_locked() -> None:
     state._ATEXIT_SHUTDOWN_REGISTERED = True
 
 
+def _ensure_fork_reinitialization_locked() -> None:
+    import os
+    import fastapiobserver.logging.state as state
+    if getattr(state, "_FORK_HOOK_REGISTERED", False):
+        return
+    if hasattr(os, "register_at_fork"):
+        os.register_at_fork(after_in_child=_restart_queue_listener_in_child)
+    setattr(state, "_FORK_HOOK_REGISTERED", True)
+
+
+def _restart_queue_listener_in_child() -> None:
+    import fastapiobserver.logging.state as state
+
+    listener = state._QUEUE_LISTENER
+    if listener is not None:
+        # The inherited queue's Condition lock might be held by the parent
+        # or left in an inconsistent state across the fork. To reliably resume
+        # processing, we must create a fresh queue and manually drain any
+        # inherited records from the old queue.
+        old_queue = cast(queue.Queue[logging.LogRecord], listener.queue)
+        new_queue: queue.Queue[logging.LogRecord] = queue.Queue(maxsize=old_queue.maxsize)
+
+        while not old_queue.empty():
+            try:
+                record = old_queue.get_nowait()
+                new_queue.put_nowait(record)
+            except queue.Empty:
+                break
+            except queue.Full:
+                break
+
+        # Re-attach the new queue to the OverflowPolicyQueueHandler if present
+        for handler in state._MANAGED_HANDLERS:
+            from .queueing import OverflowPolicyQueueHandler
+
+            if (
+                isinstance(handler, OverflowPolicyQueueHandler)
+                and getattr(handler, "queue", None) is old_queue
+            ):
+                handler.queue = new_queue
+
+        new_listener = logging.handlers.QueueListener(
+            new_queue,
+            *listener.handlers,
+            respect_handler_level=listener.respect_handler_level,
+        )
+        state._QUEUE_LISTENER = new_listener
+        new_listener.start()
+
+
 def _wrap_sink_handlers(
     handlers_with_names: list[tuple[logging.Handler, str]],
     *,

fastapi_observer-1.3.2/tests/test_fork_queue_listener.py

@@ -0,0 +1,61 @@
+import logging
+import queue
+from unittest.mock import Mock
+from fastapiobserver.logging.setup import _restart_queue_listener_in_child
+import fastapiobserver.logging.state as state
+from fastapiobserver.logging.queueing import OverflowPolicyQueueHandler
+
+
+def test_restart_queue_listener_in_child_drains_and_recreates_queue():
+    # Setup mock state
+    old_queue = queue.Queue(maxsize=10)
+    old_queue.put_nowait(
+        logging.LogRecord("test", logging.INFO, "path", 1, "test msg 1", None, None)
+    )
+    old_queue.put_nowait(
+        logging.LogRecord("test", logging.INFO, "path", 1, "test msg 2", None, None)
+    )
+
+    mock_queue_handler = Mock(spec=OverflowPolicyQueueHandler)
+    mock_queue_handler.queue = old_queue
+
+    mock_listener = Mock()
+    mock_listener.queue = old_queue
+    mock_listener.handlers = []
+    mock_listener.respect_handler_level = True
+
+    # Temporarily override state module
+    original_listener = state._QUEUE_LISTENER
+    original_handlers = state._MANAGED_HANDLERS
+    
+    state._QUEUE_LISTENER = mock_listener
+    state._MANAGED_HANDLERS = {mock_queue_handler}
+
+    try:
+        # Action
+        _restart_queue_listener_in_child()
+
+        # Assertions
+        assert old_queue.empty()
+        
+        # Verify the new listener was created and started
+        new_listener = state._QUEUE_LISTENER
+        assert new_listener is not mock_listener
+        assert new_listener.queue is not old_queue
+        assert isinstance(new_listener, logging.handlers.QueueListener)
+        # We cannot reliably assert new_listener.queue.qsize() == 2 because
+        # new_listener.start() spins up a thread that immediately begins consuming.
+
+        # Verify the managed handler got the new queue assigned to its .queue attribute
+        assert mock_queue_handler.queue is new_listener.queue
+
+        # The actual QueueListener thread isn't started in mock but the object is created
+        # new_listener.start() was called during _restart_queue_listener_in_child
+        
+    finally:
+        # Cleanup threading if start started a thread, and restore state
+        if isinstance(state._QUEUE_LISTENER, logging.handlers.QueueListener):
+            state._QUEUE_LISTENER.stop()
+            
+        state._QUEUE_LISTENER = original_listener
+        state._MANAGED_HANDLERS = original_handlers

fastapi_observer-1.3.1/src/fastapiobserver/_version.py

@@ -1 +0,0 @@
-__version__ = "1.3.1"