Make app field optional in Flask, Starlette and FastAPI instrumentations

logfire/_internal/cli/run.py

@@ -164,14 +164,21 @@ def instrument_packages(installed_otel_packages: set[str], instrument_pkg_map: d
         try:
             instrument_package(import_name)
         except Exception:
+            raise
+            breakpoint()
             continue
         instrumented.append(base_pkg)
     return instrumented
 
 
 def instrument_package(import_name: str):
     instrument_attr = f'instrument_{import_name}'
-    getattr(logfire, instrument_attr)()
+
+    if import_name in ('starlette', 'fastapi', 'flask'):
+        module = importlib.import_module(f'logfire._internal.integrations.{import_name}')
+        getattr(module, instrument_attr)(logfire.DEFAULT_LOGFIRE_INSTANCE)
+    else:
+        getattr(logfire, instrument_attr)()
 
 
 def find_recommended_instrumentations_to_install(

logfire/_internal/integrations/fastapi.py

@@ -48,7 +48,7 @@ def find_mounted_apps(app: FastAPI) -> list[FastAPI]:
 
 def instrument_fastapi(
     logfire_instance: Logfire,
-    app: FastAPI,
+    app: FastAPI | None = None,
     *,
     capture_headers: bool = False,
     request_attributes_mapper: Callable[
@@ -78,39 +78,53 @@ def instrument_fastapi(
         'meter_provider': logfire_instance.config.get_meter_provider(),
         **opentelemetry_kwargs,
     }
-    FastAPIInstrumentor.instrument_app(
-        app,
-        excluded_urls=excluded_urls,
-        server_request_hook=_server_request_hook(opentelemetry_kwargs.pop('server_request_hook', None)),
-        **opentelemetry_kwargs,
-    )
+    if app is None:
+        FastAPIInstrumentor().instrument(
+            excluded_urls=excluded_urls,
+            server_request_hook=_server_request_hook(opentelemetry_kwargs.pop('server_request_hook', None)),
+            **opentelemetry_kwargs,
+        )
 
-    registry = patch_fastapi()
-    if app in registry:  # pragma: no cover
-        raise ValueError('This app has already been instrumented.')
+        @contextmanager
+        def uninstrument_context():
+            yield
+            FastAPIInstrumentor().uninstrument()
+
+        return uninstrument_context()
+    else:
+        FastAPIInstrumentor.instrument_app(
+            app,
+            excluded_urls=excluded_urls,
+            server_request_hook=_server_request_hook(opentelemetry_kwargs.pop('server_request_hook', None)),
+            **opentelemetry_kwargs,
+        )
 
-    mounted_apps = find_mounted_apps(app)
-    mounted_apps.append(app)
+        registry = patch_fastapi()
+        if app in registry:  # pragma: no cover
+            raise ValueError('This app has already been instrumented.')
 
-    for _app in mounted_apps:
-        registry[_app] = FastAPIInstrumentation(
-            logfire_instance,
-            request_attributes_mapper or _default_request_attributes_mapper,
-        )
+        mounted_apps = find_mounted_apps(app)
+        mounted_apps.append(app)
 
-    @contextmanager
-    def uninstrument_context():
-        # The user isn't required (or even expected) to use this context manager,
-        # which is why the instrumenting and patching has already happened before this point.
-        # It exists mostly for tests, and just in case users want it.
-        try:
-            yield
-        finally:
-            for _app in mounted_apps:
-                del registry[_app]
-                FastAPIInstrumentor.uninstrument_app(_app)
+        for _app in mounted_apps:
+            registry[_app] = FastAPIInstrumentation(
+                logfire_instance,
+                request_attributes_mapper or _default_request_attributes_mapper,
+            )
 
-    return uninstrument_context()
+        @contextmanager
+        def uninstrument_context():
+            # The user isn't required (or even expected) to use this context manager,
+            # which is why the instrumenting and patching has already happened before this point.
+            # It exists mostly for tests, and just in case users want it.
+            try:
+                yield
+            finally:
+                for _app in mounted_apps:
+                    del registry[_app]
+                    FastAPIInstrumentor.uninstrument_app(_app)
+
+        return uninstrument_context()
 
 
 @lru_cache  # only patch once
@@ -151,13 +165,7 @@ class FastAPIInstrumentation:
     def __init__(
         self,
         logfire_instance: Logfire,
-        request_attributes_mapper: Callable[
-            [
-                Request | WebSocket,
-                dict[str, Any],
-            ],
-            dict[str, Any] | None,
-        ],
+        request_attributes_mapper: Callable[[Request | WebSocket, dict[str, Any]], dict[str, Any] | None],
     ):
         self.logfire_instance = logfire_instance.with_settings(custom_scope_suffix='fastapi')
         self.request_attributes_mapper = request_attributes_mapper

logfire/_internal/integrations/flask.py

@@ -15,16 +15,18 @@
         "    pip install 'logfire[flask]'"
     )
 
+from logfire import Logfire
 from logfire._internal.utils import maybe_capture_server_headers
 from logfire.integrations.flask import CommenterOptions, RequestHook, ResponseHook
 
 
 def instrument_flask(
-    app: Flask,
+    logfire_instance: Logfire,
+    app: Flask | None = None,
     *,
-    capture_headers: bool,
-    enable_commenter: bool,
-    commenter_options: CommenterOptions | None,
+    capture_headers: bool = False,
+    enable_commenter: bool = False,
+    commenter_options: CommenterOptions | None = None,
     excluded_urls: str | None = None,
     request_hook: RequestHook | None = None,
     response_hook: ResponseHook | None = None,
@@ -41,12 +43,30 @@ def instrument_flask(
         warn_at_user_stacklevel('exclude_urls is deprecated; use excluded_urls instead', DeprecationWarning)
     excluded_urls = excluded_urls or kwargs.pop('exclude_urls', None)
 
-    FlaskInstrumentor().instrument_app(  # type: ignore[reportUnknownMemberType]
-        app,
-        enable_commenter=enable_commenter,
-        commenter_options=commenter_options,
-        excluded_urls=excluded_urls,
-        request_hook=request_hook,
-        response_hook=response_hook,
-        **kwargs,
-    )
+    if app is None:
+        FlaskInstrumentor().instrument(
+            enable_commenter=enable_commenter,
+            commenter_options=commenter_options,
+            excluded_urls=excluded_urls,
+            request_hook=request_hook,
+            response_hook=response_hook,
+            **{
+                'tracer_provider': logfire_instance.config.get_tracer_provider(),
+                'meter_provider': logfire_instance.config.get_meter_provider(),
+                **kwargs,
+            },
+        )
+    else:
+        FlaskInstrumentor().instrument_app(  # type: ignore[reportUnknownMemberType]
+            app,
+            enable_commenter=enable_commenter,
+            commenter_options=commenter_options,
+            excluded_urls=excluded_urls,
+            request_hook=request_hook,
+            response_hook=response_hook,
+            **{
+                'tracer_provider': logfire_instance.config.get_tracer_provider(),
+                'meter_provider': logfire_instance.config.get_meter_provider(),
+                **kwargs,
+            },
+        )

logfire/_internal/integrations/starlette.py

@@ -21,7 +21,7 @@
 
 def instrument_starlette(
     logfire_instance: Logfire,
-    app: Starlette,
+    app: Starlette | None = None,
     *,
     record_send_receive: bool = False,
     capture_headers: bool = False,
@@ -35,14 +35,26 @@ def instrument_starlette(
     See the `Logfire.instrument_starlette` method for details.
     """
     maybe_capture_server_headers(capture_headers)
-    StarletteInstrumentor().instrument_app(
-        app,
-        server_request_hook=server_request_hook,
-        client_request_hook=client_request_hook,
-        client_response_hook=client_response_hook,
-        **{  # type: ignore
-            'tracer_provider': tweak_asgi_spans_tracer_provider(logfire_instance, record_send_receive),
-            'meter_provider': logfire_instance.config.get_meter_provider(),
-            **kwargs,
-        },
-    )
+    if app is None:
+        StarletteInstrumentor().instrument(
+            server_request_hook=server_request_hook,
+            client_request_hook=client_request_hook,
+            client_response_hook=client_response_hook,
+            **{
+                'tracer_provider': tweak_asgi_spans_tracer_provider(logfire_instance, record_send_receive),
+                'meter_provider': logfire_instance.config.get_meter_provider(),
+                **kwargs,
+            },
+        )
+    else:
+        StarletteInstrumentor().instrument_app(
+            app,
+            server_request_hook=server_request_hook,
+            client_request_hook=client_request_hook,
+            client_response_hook=client_response_hook,
+            **{  # type: ignore
+                'tracer_provider': tweak_asgi_spans_tracer_provider(logfire_instance, record_send_receive),
+                'meter_provider': logfire_instance.config.get_meter_provider(),
+                **kwargs,
+            },
+        )

logfire/_internal/main.py

@@ -11,15 +11,7 @@
 from enum import Enum
 from functools import cached_property
 from time import time
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Literal,
-    TypeVar,
-    Union,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, Callable, Literal, TypeVar, Union, overload
 
 import opentelemetry.context as context_api
 import opentelemetry.trace as trace_api
@@ -1572,18 +1564,15 @@ def instrument_flask(
 
         self._warn_if_not_initialized_for_instrumentation()
         return instrument_flask(
+            self,
             app,
             capture_headers=capture_headers,
             enable_commenter=enable_commenter,
             commenter_options=commenter_options,
             excluded_urls=excluded_urls,
             request_hook=request_hook,
             response_hook=response_hook,
-            **{
-                'tracer_provider': self._config.get_tracer_provider(),
-                'meter_provider': self._config.get_meter_provider(),
-                **kwargs,
-            },
+            **kwargs,
         )
 
     def instrument_starlette(