cuneus 0.2.11__py3-none-any.whl → 0.2.12__py3-none-any.whl

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)

{cuneus-0.2.11.dist-info → cuneus-0.2.12.dist-info}/METADATA

@@ -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.dist-info → cuneus-0.2.12.dist-info}/RECORD

@@ -12,9 +12,9 @@ cuneus/core/settings.py,sha256=75NRttKkLpT6AxVd6dj3boYq05j5td32-c7fAlTjLsg,2247
 cuneus/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cuneus/ext/database.py,sha256=BED5A73U-yVVPxUJe1nuzOBee7D0QnMvcmk8V_3hUNI,8987
 cuneus/ext/health.py,sha256=l561FKnOhlsuCxJF2lSxwiEagdakixoaD78MGz4SL1s,3590
-cuneus/ext/otel.py,sha256=MQ7npEgz9RZzHRFgRVovoyo6As_vFnLetx_Y3W887hs,9408
+cuneus/ext/otel.py,sha256=tGOqY7Q2A6NTjZ6i343IPMFjiyrL30WmlHM4VQrlrN4,9778
 cuneus/ext/server.py,sha256=wyQMiHFZEFYt1a4wC4IjorEp70kH7fF2aLx3_X5t5RI,1869
-cuneus-0.2.11.dist-info/METADATA,sha256=nb3_8fr1cFjec7AJdmTZvsV5N8QzJzsX0QhrfUb-J6E,7051
-cuneus-0.2.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-cuneus-0.2.11.dist-info/entry_points.txt,sha256=tzPgom-_UkpP_uLKv3V_XyoIsKg84FBAc9ddjYl0W0Y,43
-cuneus-0.2.11.dist-info/RECORD,,
+cuneus-0.2.12.dist-info/METADATA,sha256=XcWXu731u-D7Sa5q6qaojIBeGs9cYmyI54yttKYu0ko,7051
+cuneus-0.2.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cuneus-0.2.12.dist-info/entry_points.txt,sha256=tzPgom-_UkpP_uLKv3V_XyoIsKg84FBAc9ddjYl0W0Y,43
+cuneus-0.2.12.dist-info/RECORD,,