fix

Author: adriangb

instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/__init__.py

@@ -203,9 +203,9 @@ def client_response_hook(span: Span, scope: dict[str, Any], message: dict[str, A
 from opentelemetry.instrumentation.fastapi.package import _instruments
 from opentelemetry.instrumentation.fastapi.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.metrics import Meter, get_meter
+from opentelemetry.metrics import MeterProvider, get_meter
 from opentelemetry.semconv.trace import SpanAttributes
-from opentelemetry.trace import Tracer, get_tracer
+from opentelemetry.trace import TracerProvider, get_tracer
 from opentelemetry.util.http import (
     get_excluded_urls,
     parse_excluded_urls,
@@ -230,8 +230,8 @@ def instrument_app(
         server_request_hook: ServerRequestHook = None,
         client_request_hook: ClientRequestHook = None,
         client_response_hook: ClientResponseHook = None,
-        tracer_provider: Tracer | None = None,
-        meter_provider: Meter | None = None,
+        tracer_provider: TracerProvider | None = None,
+        meter_provider: MeterProvider | None = None,
         excluded_urls: str | None = None,
         http_capture_headers_server_request: list[str] | None = None,
         http_capture_headers_server_response: list[str] | None = None,
@@ -362,12 +362,7 @@ def _instrument(self, **kwargs):
         _InstrumentedFastAPI._http_capture_headers_sanitize_fields = (
             kwargs.get("http_capture_headers_sanitize_fields")
         )
-        _excluded_urls = kwargs.get("excluded_urls")
-        _InstrumentedFastAPI._excluded_urls = (
-            _excluded_urls_from_env
-            if _excluded_urls is None
-            else parse_excluded_urls(_excluded_urls)
-        )
+        _InstrumentedFastAPI._excluded_urls = kwargs.get("excluded_urls")
         _InstrumentedFastAPI._meter_provider = kwargs.get("meter_provider")
         _InstrumentedFastAPI._exclude_spans = kwargs.get("exclude_spans")
         fastapi.FastAPI = _InstrumentedFastAPI

instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py

@@ -170,7 +170,8 @@ def setUp(self):
         self._instrumentor = otel_fastapi.FastAPIInstrumentor()
         self._app = self._create_app()
         self._app.add_middleware(HTTPSRedirectMiddleware)
-        self._client = TestClient(self._app)
+        self._client = TestClient(self._app, base_url="https://testserver:443")
+        self._client.__enter__()  # run the lifespan, initialize the middleware stack
 
     def tearDown(self):
         super().tearDown()
@@ -205,19 +206,11 @@ async def _(param: str):
         async def _():
             return {"message": "ok"}
 
-        @app.get("/error")
-        async def _():
-            raise UnhandledException("This is an unhandled exception")
-
         app.mount("/sub", app=sub_app)
 
         return app
 
 
-class UnhandledException(Exception):
-    pass
-
-
 class TestBaseManualFastAPI(TestBaseFastAPI):
     @classmethod
     def setUpClass(cls):
@@ -406,26 +399,6 @@ def test_fastapi_excluded_urls(self):
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 0)
 
-    def test_fastapi_unhandled_exception(self):
-        """If the application has an unhandled error the instrumentation should capture that a 500 response is returned."""
-        try:
-            self._client.get("/error")
-        except UnhandledException:
-            pass
-        else:
-            self.fail("Expected UnhandledException")
-
-        spans = self.memory_exporter.get_finished_spans()
-        self.assertEqual(len(spans), 3)
-        for span in spans:
-            self.assertIn("GET /error", span.name)
-            self.assertEqual(
-                span.attributes[SpanAttributes.HTTP_ROUTE], "/error"
-            )
-            self.assertEqual(
-                span.attributes[SpanAttributes.HTTP_STATUS_CODE], 500
-            )
-
     def test_fastapi_excluded_urls_not_env(self):
         """Ensure that given fastapi routes are excluded when passed explicitly (not in the environment)"""
         app = self._create_app_explicit_excluded_urls()
@@ -1152,9 +1125,13 @@ def test_request(self):
     def test_mulitple_way_instrumentation(self):
         self._instrumentor.instrument_app(self._app)
         count = 0
-        for middleware in self._app.user_middleware:
-            if middleware.cls is OpenTelemetryMiddleware:
+        app = self._app.middleware_stack
+        while True:
+            if isinstance(app, OpenTelemetryMiddleware):
                 count += 1
+            if app is None:
+                break
+            app = getattr(app, "app", None)
         self.assertEqual(count, 1)
 
     def test_uninstrument_after_instrument(self):