fix(otel): replace middleware with fastapi middleware

Author: iamemilio

llama_stack/core/server/server.py

@@ -410,6 +410,7 @@ def create_app() -> StackApp:
 
     if Api.telemetry in impls:
         setup_logger(impls[Api.telemetry])
+        TelemetryAdapter.fastapi_middleware(app)  # hold us over until we can move to programmatic instrumentation
     else:
         setup_logger(TelemetryAdapter(TelemetryConfig(), {}))
 

llama_stack/providers/inline/telemetry/meta_reference/telemetry.py

@@ -8,9 +8,11 @@
 import threading
 from typing import Any
 
+from fastapi import FastAPI
 from opentelemetry import metrics, trace
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
 from opentelemetry.sdk.resources import Resource
@@ -362,3 +364,8 @@ async def get_span_tree(
                 max_depth=max_depth,
             )
         )
+
+    @staticmethod
+    def fastapi_middleware(app: FastAPI):
+        """Inject telemetry middleware into the FastAPI app"""
+        FastAPIInstrumentor.instrument_app(app)

pyproject.toml

@@ -25,14 +25,14 @@ classifiers = [
 ]
 dependencies = [
     "aiohttp",
-    "fastapi>=0.115.0,<1.0",                  # server
-    "fire",                                   # for MCP in LLS client
+    "fastapi>=0.115.0,<1.0", # server
+    "fire", # for MCP in LLS client
     "httpx",
     "huggingface-hub>=0.34.0,<1.0",
     "jinja2>=3.1.6",
     "jsonschema",
     "llama-stack-client>=0.2.23",
-    "openai>=1.107",                                # for expires_after support
+    "openai>=1.107", # for expires_after support
     "prompt-toolkit",
     "python-dotenv",
     "python-jose[cryptography]",
@@ -43,13 +43,14 @@ dependencies = [
     "tiktoken",
     "pillow",
     "h11>=0.16.0",
-    "python-multipart>=0.0.20",               # For fastapi Form
-    "uvicorn>=0.34.0",                        # server
-    "opentelemetry-sdk>=1.30.0",              # server
+    "python-multipart>=0.0.20", # For fastapi Form
+    "uvicorn>=0.34.0", # server
+    "opentelemetry-sdk>=1.30.0", # server
     "opentelemetry-exporter-otlp-proto-http>=1.30.0", # server
-    "aiosqlite>=0.21.0",                      # server - for metadata store
-    "asyncpg",                                # for metadata store
-    "sqlalchemy[asyncio]>=2.0.41",           # server - for conversations
+    "aiosqlite>=0.21.0", # server - for metadata store
+    "asyncpg", # for metadata store
+    "sqlalchemy[asyncio]>=2.0.41", # server - for conversations
+    "opentelemetry-instrumentation-fastapi>=0.57b0",
 ]
 
 [project.optional-dependencies]