Upgrade dependencies (#1039)

alexmojaki · web-flow · commit 88f286b68f8c · 2025-04-25T12:41:39.000Z
diff --git a/logfire/_internal/config.py b/logfire/_internal/config.py
@@ -19,17 +19,17 @@
 
 import requests
 from opentelemetry import trace
-from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider  # type: ignore
+from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider
 from opentelemetry.environment_variables import OTEL_LOGS_EXPORTER, OTEL_METRICS_EXPORTER, OTEL_TRACES_EXPORTER
 from opentelemetry.exporter.otlp.proto.http import Compression
-from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter  # type: ignore
+from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.metrics import NoOpMeterProvider, set_meter_provider
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
-from opentelemetry.sdk._logs import LoggerProvider as SDKLoggerProvider, LogRecordProcessor  # type: ignore
-from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor  # type: ignore
-from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor  # type: ignore
+from opentelemetry.sdk._logs import LoggerProvider as SDKLoggerProvider, LogRecordProcessor
+from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor
 from opentelemetry.sdk.environment_variables import (
     OTEL_BSP_SCHEDULE_DELAY,
     OTEL_EXPORTER_OTLP_ENDPOINT,
@@ -111,7 +111,7 @@
 )
 
 if TYPE_CHECKING:
-    from opentelemetry._events import EventLoggerProvider  # type: ignore
+    from opentelemetry._events import EventLoggerProvider
 
     from .main import Logfire
 
@@ -708,7 +708,7 @@ def __init__(
         self._meter_provider = ProxyMeterProvider(NoOpMeterProvider())
         self._logger_provider = ProxyLoggerProvider(NoOpLoggerProvider())
         try:
-            from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider  # type: ignore
+            from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider
 
             self._event_logger_provider = SDKEventLoggerProvider(self._logger_provider)  # type: ignore
         except ImportError:
@@ -1071,7 +1071,7 @@ def fix_pid():  # pragma: no cover
                 set_meter_provider(self._meter_provider)
                 set_logger_provider(self._logger_provider)
                 if self._event_logger_provider:
-                    from opentelemetry._events import set_event_logger_provider  # type: ignore
+                    from opentelemetry._events import set_event_logger_provider
 
                     set_event_logger_provider(self._event_logger_provider)
 
diff --git a/logfire/_internal/exporters/console.py b/logfire/_internal/exporters/console.py
@@ -14,8 +14,8 @@
 from textwrap import indent as indent_text
 from typing import Any, List, Literal, Mapping, TextIO, Tuple, cast
 
-from opentelemetry.sdk._logs import LogData, LogRecord  # type: ignore
-from opentelemetry.sdk._logs.export import LogExporter, LogExportResult  # type: ignore
+from opentelemetry.sdk._logs import LogData, LogRecord
+from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
 from opentelemetry.sdk.trace import Event, ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.util import types as otel_types
diff --git a/logfire/_internal/exporters/logs.py b/logfire/_internal/exporters/logs.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from opentelemetry.sdk._logs import LogData  # type: ignore
+from opentelemetry.sdk._logs import LogData
 
 import logfire
 from logfire._internal.exporters.wrapper import WrapperLogProcessor
diff --git a/logfire/_internal/exporters/otlp.py b/logfire/_internal/exporters/otlp.py
@@ -12,8 +12,8 @@
 
 import requests.exceptions
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-from opentelemetry.sdk._logs import LogData  # type: ignore
-from opentelemetry.sdk._logs._internal.export import LogExportResult  # type: ignore
+from opentelemetry.sdk._logs import LogData
+from opentelemetry.sdk._logs._internal.export import LogExportResult
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExportResult
 from requests import Session
diff --git a/logfire/_internal/exporters/test.py b/logfire/_internal/exporters/test.py
@@ -12,9 +12,9 @@
 from typing import Any, Mapping, cast
 
 from opentelemetry import trace
-from opentelemetry.sdk._logs import LogData  # type: ignore
-from opentelemetry.sdk._logs._internal.export import LogExportResult  # type: ignore
-from opentelemetry.sdk._logs.export import InMemoryLogExporter  # type: ignore
+from opentelemetry.sdk._logs import LogData
+from opentelemetry.sdk._logs._internal.export import LogExportResult
+from opentelemetry.sdk._logs.export import InMemoryLogExporter
 from opentelemetry.sdk.trace import Event, ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.semconv.resource import ResourceAttributes
diff --git a/logfire/_internal/exporters/wrapper.py b/logfire/_internal/exporters/wrapper.py
@@ -4,8 +4,8 @@
 from typing import Any, Sequence, cast
 
 from opentelemetry import context
-from opentelemetry.sdk._logs import LogData, LogRecordProcessor  # type: ignore
-from opentelemetry.sdk._logs.export import LogExporter, LogExportResult  # type: ignore
+from opentelemetry.sdk._logs import LogData, LogRecordProcessor
+from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
 from opentelemetry.sdk.metrics.export import AggregationTemporality, MetricExporter, MetricExportResult, MetricsData
 from opentelemetry.sdk.metrics.view import Aggregation
 from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor
diff --git a/logfire/_internal/integrations/llm_providers/openai.py b/logfire/_internal/integrations/llm_providers/openai.py
@@ -108,7 +108,7 @@ def get_response_data(self) -> Any:
 
 try:
     # ChatCompletionStreamState only exists in openai>=1.40.0
-    from openai.lib.streaming.chat._completions import ChatCompletionStreamState  # type: ignore
+    from openai.lib.streaming.chat._completions import ChatCompletionStreamState
 
     class OpenaiChatCompletionStreamState(StreamState):
         def __init__(self):
diff --git a/logfire/_internal/logs.py b/logfire/_internal/logs.py
@@ -7,7 +7,7 @@
 from typing import Any
 from weakref import WeakSet
 
-from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider  # type: ignore
+from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider
 from opentelemetry.util.types import Attributes
 
 
diff --git a/logfire/_internal/scrubbing.py b/logfire/_internal/scrubbing.py
@@ -9,7 +9,7 @@
 
 import typing_extensions
 from opentelemetry.attributes import BoundedAttributes
-from opentelemetry.sdk._logs import LogRecord  # type: ignore
+from opentelemetry.sdk._logs import LogRecord
 from opentelemetry.sdk.trace import Event
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Link
diff --git a/logfire/_internal/utils.py b/logfire/_internal/utils.py
@@ -221,7 +221,7 @@ def get_version(version: str) -> Version:
 
     except ImportError:  # pragma: no cover
         # Trigger the sys.path change mentioned below, but discard this.
-        from setuptools._vendor.packaging.version import Version  # type: ignore
+        from setuptools._vendor.packaging.version import Version
 
         try:
             # See https://pydanticlogfire.slack.com/archives/C06EDRBSAH3/p1722017944332959
@@ -234,7 +234,7 @@ def get_version(version: str) -> Version:
 
         except ImportError:
             # sys.path is only changed in newer versions, so fallback to just importing the vendored Version directly.
-            from setuptools._vendor.packaging.version import Version  # type: ignore
+            from setuptools._vendor.packaging.version import Version
     return Version(version)  # type: ignore
 
 
diff --git a/logfire/testing.py b/logfire/testing.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 
 import pytest
-from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor  # type: ignore
+from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
 from opentelemetry.sdk.metrics.export import InMemoryMetricReader
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.id_generator import IdGenerator
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -9,7 +9,7 @@
 import anyio._backends._asyncio  # noqa  # type: ignore
 import pytest
 from opentelemetry import trace
-from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor  # type: ignore
+from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
 from opentelemetry.sdk.metrics.export import InMemoryMetricReader
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.sdk.trace.id_generator import IdGenerator
diff --git a/tests/otel_integrations/test_openai_agents.py b/tests/otel_integrations/test_openai_agents.py
@@ -456,6 +456,7 @@ def random_number() -> int:
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ced68228748191b31ea5d9172a7b4b',
@@ -753,6 +754,7 @@ def random_number() -> int:
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ced68425f48191a5fb0c2b61cb27dd',
@@ -1098,6 +1100,7 @@ async def zero_guardrail(_context: Any, _agent: Agent[Any], inp: Any) -> Guardra
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67cee263c6e0819184efdc0fe2624cc8',
@@ -1424,6 +1427,7 @@ async def test_chat_completions(exporter: TestExporter):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                         'base_url': 'https://api.openai.com/v1/',
                     },
                     'usage': {'input_tokens': 11, 'output_tokens': 8},
@@ -1783,6 +1787,7 @@ async def test_responses_simple(exporter: TestExporter):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ceee053cdc81919f39173ee02cb88e',
@@ -1975,6 +1980,7 @@ async def test_responses_simple(exporter: TestExporter):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ceee0623ac819190454bc7af968938',
@@ -2227,6 +2233,7 @@ async def test_file_search(exporter: TestExporter):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ceff39d5e88191885004de76d26e43',
@@ -2498,6 +2505,7 @@ async def test_file_search(exporter: TestExporter):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'response': {
                         'id': 'resp_67ceff3c84548191b620a2cf4c2e37f2',
@@ -2806,6 +2814,7 @@ def tool():
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'gen_ai.request.model': 'gpt-4o',
                     'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
@@ -3038,6 +3047,7 @@ def tool():
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'gen_ai.request.model': 'gpt-4o',
                     'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
@@ -3423,6 +3433,7 @@ async def test_voice_pipeline(exporter: TestExporter, vcr_allow_bytes: None):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'gen_ai.request.model': 'gpt-4o',
                     'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
diff --git a/tests/otel_integrations/test_openai_agents_mcp.py b/tests/otel_integrations/test_openai_agents_mcp.py
@@ -66,7 +66,7 @@ async def random_number(ctx: Context) -> int:  # type: ignore
 
         class MyMCPServer(_MCPServerWithClientSession):
             def __init__(self, streams: Any):
-                super().__init__(False)
+                super().__init__(cache_tools_list=False, client_session_timeout_seconds=1000)
                 self._streams = streams
 
             @asynccontextmanager
@@ -322,6 +322,7 @@ def name(self):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'gen_ai.request.model': 'gpt-4o',
                     'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
@@ -626,6 +627,7 @@ def name(self):
                         'include_usage': None,
                         'extra_query': None,
                         'extra_body': None,
+                        'extra_headers': None,
                     },
                     'gen_ai.request.model': 'gpt-4o',
                     'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
diff --git a/tests/test_configure.py b/tests/test_configure.py
@@ -18,16 +18,16 @@
 import requests_mock
 from dirty_equals import IsStr
 from inline_snapshot import snapshot
-from opentelemetry._logs import get_logger_provider  # type: ignore
-from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter  # type: ignore
+from opentelemetry._logs import get_logger_provider
+from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.metrics import NoOpMeterProvider, get_meter_provider
 from opentelemetry.propagate import get_global_textmap
 from opentelemetry.propagators.composite import CompositePropagator
-from opentelemetry.sdk._logs import LogRecordProcessor  # type: ignore
-from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor  # type: ignore
-from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor  # type: ignore
+from opentelemetry.sdk._logs import LogRecordProcessor
+from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor
 from opentelemetry.sdk.metrics.export import InMemoryMetricReader, PeriodicExportingMetricReader
 from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor, SynchronousMultiSpanProcessor
 from opentelemetry.sdk.trace.export import (
diff --git a/tests/test_console_exporter.py b/tests/test_console_exporter.py
@@ -9,8 +9,8 @@
 from dirty_equals import IsStr
 from inline_snapshot import snapshot
 from opentelemetry import trace
-from opentelemetry._events import Event, get_event_logger  # type: ignore
-from opentelemetry._logs import LogRecord, SeverityNumber, get_logger  # type: ignore
+from opentelemetry._events import Event, get_event_logger
+from opentelemetry._logs import LogRecord, SeverityNumber, get_logger
 from opentelemetry.sdk.trace import ReadableSpan
 
 import logfire
diff --git a/tests/test_otel_logs.py b/tests/test_otel_logs.py
@@ -7,14 +7,14 @@
 import requests.exceptions
 from dirty_equals import IsStr
 from inline_snapshot import snapshot
-from opentelemetry._events import Event, get_event_logger, get_event_logger_provider  # type: ignore
-from opentelemetry._logs import LogRecord, SeverityNumber, get_logger, get_logger_provider  # type: ignore
-from opentelemetry.sdk._logs import LogData  # type: ignore
+from opentelemetry._events import Event, get_event_logger, get_event_logger_provider
+from opentelemetry._logs import LogRecord, SeverityNumber, get_logger, get_logger_provider
+from opentelemetry.sdk._logs import LogData
 from opentelemetry.sdk._logs.export import (
-    InMemoryLogExporter,  # type: ignore
-    LogExporter,  # type: ignore
-    LogExportResult,  # type: ignore
-    SimpleLogRecordProcessor,  # type: ignore
+    InMemoryLogExporter,
+    LogExporter,
+    LogExportResult,
+    SimpleLogRecordProcessor,
 )
 from opentelemetry.sdk.resources import Resource
 
diff --git a/tests/test_secret_scrubbing.py b/tests/test_secret_scrubbing.py
@@ -7,8 +7,8 @@
 import pytest
 from dirty_equals import IsJson, IsPartialDict
 from inline_snapshot import snapshot
-from opentelemetry._events import Event, get_event_logger  # type: ignore
-from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor  # type: ignore
+from opentelemetry._events import Event, get_event_logger
+from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
 from opentelemetry.sdk.environment_variables import OTEL_RESOURCE_ATTRIBUTES
 from opentelemetry.trace.propagation import get_current_span
 
diff --git a/uv.lock b/uv.lock
