Remove tracer and meter providers from type hints (#321)

pydantic · Jul 17, 2024 · 02e511e · 02e511e
1 parent 474f525
commit 02e511e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/logfire/_internal/integrations/flask.py b/logfire/_internal/integrations/flask.py
@@ -8,8 +8,7 @@
 if TYPE_CHECKING:
     from wsgiref.types import WSGIEnvironment
 
-    from opentelemetry.metrics import MeterProvider
-    from opentelemetry.trace import Span, TracerProvider
+    from opentelemetry.trace import Span
     from typing_extensions import Protocol, TypedDict, Unpack
 
     class RequestHook(Protocol):
@@ -21,11 +20,9 @@ def __call__(self, span: Span, status: str, response_headers: list[tuple[str, st
     class FlaskInstrumentKwargs(TypedDict, total=False):
         request_hook: RequestHook | None
         response_hook: RequestHook | None
-        tracer_provider: TracerProvider | None
         excluded_urls: str | None
         enable_commenter: bool | None
         commenter_options: dict[str, str] | None
-        meter_provider: MeterProvider | None
 
 
 def instrument_flask(app: Flask, **kwargs: Unpack[FlaskInstrumentKwargs]):

diff --git a/logfire/_internal/integrations/psycopg.py b/logfire/_internal/integrations/psycopg.py
@@ -23,7 +23,6 @@ class CommenterOptions(TypedDict, total=False):
     class PsycopgInstrumentKwargs(TypedDict, total=False):
         enable_commenter: bool
         commenter_options: CommenterOptions
-        skip_dep_check: bool
 
 
 PACKAGE_NAMES = ('psycopg', 'psycopg2')

diff --git a/logfire/_internal/integrations/pymongo.py b/logfire/_internal/integrations/pymongo.py
@@ -5,8 +5,6 @@
 from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
 
 if TYPE_CHECKING:
-    from opentelemetry.metrics import MeterProvider
-    from opentelemetry.trace import TracerProvider
     from pymongo.monitoring import CommandFailedEvent, CommandStartedEvent, CommandSucceededEvent
     from typing_extensions import Protocol, TypedDict, Unpack
 
@@ -24,8 +22,6 @@ class PymongoInstrumentKwargs(TypedDict, total=False):
         response_hook: ResponseHook | None
         failed_hook: FailedHook | None
         capture_statement: bool | None
-        tracer_provider: TracerProvider | None
-        meter_provider: MeterProvider | None
         skip_dep_check: bool
 
 

diff --git a/logfire/_internal/integrations/redis.py b/logfire/_internal/integrations/redis.py
@@ -5,8 +5,7 @@
 from opentelemetry.instrumentation.redis import RedisInstrumentor
 
 if TYPE_CHECKING:
-    from opentelemetry.metrics import MeterProvider
-    from opentelemetry.trace import Span, TracerProvider
+    from opentelemetry.trace import Span
     from redis import Connection
     from typing_extensions import Protocol, TypedDict, Unpack
 
@@ -19,8 +18,6 @@ def __call__(self, span: Span, instance: Connection, response: Any) -> None: ...
     class RedisInstrumentKwargs(TypedDict, total=False):
         request_hook: RequestHook | None
         response_hook: ResponseHook | None
-        tracer_provider: TracerProvider | None
-        meter_provider: MeterProvider | None
         skip_dep_check: bool
 
 

diff --git a/logfire/_internal/integrations/starlette.py b/logfire/_internal/integrations/starlette.py
@@ -6,8 +6,7 @@
 from starlette.applications import Starlette
 
 if TYPE_CHECKING:
-    from opentelemetry.metrics import MeterProvider
-    from opentelemetry.trace import Span, TracerProvider
+    from opentelemetry.trace import Span
     from typing_extensions import Protocol, TypedDict, Unpack
 
     class ServerRequestHook(Protocol):
@@ -23,8 +22,6 @@ class StarletteInstrumentKwargs(TypedDict, total=False):
         server_request_hook: ServerRequestHook | None
         client_request_hook: ClientRequestHook | None
         client_response_hook: ClientResponseHook | None
-        tracer_provider: TracerProvider | None
-        meter_provider: MeterProvider | None
 
 
 def instrument_starlette(app: Starlette, **kwargs: Unpack[StarletteInstrumentKwargs]):