cuneus 0.2.11__tar.gz → 0.2.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuneus
-Version: 0.2.11
+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.11 → cuneus-0.2.12}/pyproject.toml

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

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

@@ -104,6 +104,7 @@ class OTelExtension(BaseExtension, HasMiddleware):
     """
 
     _tracer_provider: TracerProvider
+    _meter_provider: MeterProvider | None = None
 
     def __init__(
         self,
@@ -146,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",
@@ -159,7 +160,8 @@ 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)
 
         return {"tracer_provider": self._tracer_provider}
 
@@ -179,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",
@@ -208,6 +205,17 @@ 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:
             mod = importlib.import_module(module)