cuneus 0.2.10__tar.gz → 0.2.12__tar.gz

{cuneus-0.2.10 → cuneus-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuneus
-Version: 0.2.10
+Version: 0.2.12
 Summary: ASGI application wrapper
 Project-URL: Homepage, https://github.com/rmyers/cuneus
 Project-URL: Documentation, https://github.com/rmyers/cuneus#readme

{cuneus-0.2.10 → cuneus-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cuneus"
-version = "0.2.10"
+version = "0.2.12"
 description = "ASGI application wrapper"
 readme = "README.md"
 authors = [{ name = "Robert Myers", email = "robert@julython.org" }]

{cuneus-0.2.10 → cuneus-0.2.12}/src/cuneus/cli.py

@@ -8,12 +8,15 @@ from .core.settings import Settings, ensure_project_in_path
 from .utils import import_from_string
 
 
-def get_user_cli(config: Settings = Settings()) -> click.Group | None:
+def get_user_cli(config: Settings | None = None) -> click.Group | None:
     """Load CLI from config."""
+    config = config or Settings()
     try:
         return cast(click.Group, import_from_string(config.cli_module))
     except (ImportError, AttributeError) as e:
-        click.echo(f"Warning: Could not load CLI from {config.cli_module}: {e}", err=True)
+        click.echo(
+            f"Warning: Could not load CLI from {config.cli_module}: {e}", err=True
+        )
         return None
 
 

{cuneus-0.2.10 → cuneus-0.2.12}/src/cuneus/core/application.py

@@ -4,9 +4,6 @@ cuneus - The wedge stone that locks the arch together.
 Lightweight lifespan management for FastAPI applications.
 """
 
-from __future__ import annotations
-
-import inspect
 from contextlib import AsyncExitStack, asynccontextmanager
 from typing import Any, AsyncIterator, Callable
 
@@ -41,7 +38,9 @@ class ExtensionConflictError(Exception):
     pass
 
 
-def _instantiate_extension(ext: ExtensionInput, settings: Settings | None = None) -> Extension:
+def _instantiate_extension(
+    ext: ExtensionInput, settings: Settings | None = None
+) -> Extension:
     if isinstance(ext, type) or callable(ext):
         try:
             return ext(settings=settings)
@@ -67,13 +66,13 @@ def build_app(
         from myapp.extensions import DatabaseExtension
 
         settings = Settings()
-        app, cli = build_app(
+        app, cli, lifespan = build_app(
             SettingsExtension(settings),
             DatabaseExtension(settings),
             title="Args are passed to FastAPI",
         )
 
-        __all__ = ["app", "cli"]
+        __all__ = ["app", "cli", "lifespan"]
 
     Testing:
         from myapp import app, lifespan
@@ -95,7 +94,9 @@ def build_app(
 
     @svcs.fastapi.lifespan
     @asynccontextmanager
-    async def lifespan(app: FastAPI, registry: svcs.Registry) -> AsyncIterator[dict[str, Any]]:
+    async def lifespan(
+        app: FastAPI, registry: svcs.Registry
+    ) -> AsyncIterator[dict[str, Any]]:
         async with AsyncExitStack() as stack:
             state: dict[str, Any] = {}
 

{cuneus-0.2.10 → cuneus-0.2.12}/src/cuneus/core/logging.py

@@ -8,11 +8,10 @@ import logging
 import shutil
 import time
 import uuid
-from typing import Any, Awaitable, Callable
+from typing import Awaitable, Callable
 
 import structlog
-import svcs
-from fastapi import FastAPI, Request, Response
+from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware import Middleware
 from starlette.types import ASGIApp
@@ -33,7 +32,6 @@ def configure_structlog(settings: Settings | None = None) -> None:
         structlog.stdlib.add_logger_name,
         structlog.stdlib.PositionalArgumentsFormatter(),
         structlog.processors.TimeStamper(fmt="iso", utc=True),
-        structlog.processors.StackInfoRenderer(),
         structlog.processors.UnicodeDecoder(),
     ]
 
@@ -76,6 +74,7 @@ def configure_structlog(settings: Settings | None = None) -> None:
 
     # Quiet noisy loggers
     logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
+    logging.getLogger("svcs").setLevel(logging.INFO)
 
 
 class LoggingExtension(BaseExtension):

{cuneus-0.2.10 → cuneus-0.2.12}/src/cuneus/ext/otel.py

@@ -1,8 +1,7 @@
-# cuneus/ext/otel.py
 from __future__ import annotations
 
-from contextlib import asynccontextmanager
-from typing import Any, AsyncIterator, Callable
+import importlib
+from typing import Any, Callable
 
 import structlog
 import svcs
@@ -105,6 +104,7 @@ class OTelExtension(BaseExtension, HasMiddleware):
     """
 
     _tracer_provider: TracerProvider
+    _meter_provider: MeterProvider | None = None
 
     def __init__(
         self,
@@ -116,14 +116,10 @@ class OTelExtension(BaseExtension, HasMiddleware):
         self._span_exporters = span_exporters or []
         self._span_processors = span_processors or []
 
-    @asynccontextmanager
-    async def register(
-        self, registry: svcs.Registry, app: FastAPI
-    ) -> AsyncIterator[dict[str, Any]]:
+    async def startup(self, registry: svcs.Registry, app: FastAPI) -> dict[str, Any]:
         if not self.settings.enabled:
             logger.info("OpenTelemetry disabled")
-            yield {}
-            return
+            return {}
 
         resource = Resource.create(
             {
@@ -151,7 +147,7 @@ class OTelExtension(BaseExtension, HasMiddleware):
                 self._tracer_provider.get_tracer(self.settings.service_name),
             )
 
-            self._setup_auto_instrumentation()
+            self._setup_auto_instrumentation(app)
 
             logger.info(
                 "OpenTelemetry tracing started",
@@ -164,14 +160,15 @@ class OTelExtension(BaseExtension, HasMiddleware):
         if self.settings.metrics_enabled:
             meter_provider = MeterProvider(resource=resource)
             metrics.set_meter_provider(meter_provider)
-            registry.register_value(MeterProvider, meter_provider)
+            self._meter_provider = meter_provider
+            registry.register_value(MeterProvider, self._meter_provider)
 
-        try:
-            yield {"tracer_provider": self._tracer_provider}
-        finally:
-            if self._tracer_provider:
-                self._tracer_provider.shutdown()
-                logger.info("OpenTelemetry shutdown")
+        return {"tracer_provider": self._tracer_provider}
+
+    async def shutdown(self, app: FastAPI) -> None:
+        if self._tracer_provider:
+            self._tracer_provider.shutdown()
+            logger.info("OpenTelemetry shutdown")
 
     def middleware(self) -> list[Middleware]:
         if not self.settings.enabled or not self.settings.traces_enabled:
@@ -184,14 +181,9 @@ class OTelExtension(BaseExtension, HasMiddleware):
             )
         ]
 
-    def _setup_auto_instrumentation(self) -> None:
+    def _setup_auto_instrumentation(self, app: FastAPI) -> None:
         """Setup auto-instrumentation based on settings."""
         instrumentors = [
-            (
-                self.settings.instrument_fastapi,
-                "opentelemetry.instrumentation.fastapi",
-                "FastAPIInstrumentor",
-            ),
             (
                 self.settings.instrument_sqlalchemy,
                 "opentelemetry.instrumentation.sqlalchemy",
@@ -213,10 +205,19 @@ class OTelExtension(BaseExtension, HasMiddleware):
             if enabled:
                 self._try_instrument(module, class_name)
 
+        if self.settings.instrument_fastapi:
+            from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
+
+            inst = FastAPIInstrumentor()
+            inst.instrument_app(
+                app,
+                tracer_provider=self._tracer_provider,
+                meter_provider=self._meter_provider,
+            )
+            logger.debug("FastAPIInstrumentor auto-instrumentation enabled")
+
     def _try_instrument(self, module: str, class_name: str) -> None:
         try:
-            import importlib
-
             mod = importlib.import_module(module)
             instrumentor = getattr(mod, class_name)()
             instrumentor.instrument()