Skip to content

Commit 88f286b

Browse files
alexmojakialexmojaki
authored
Upgrade dependencies (#1039)
1 parent 153e67a commit 88f286b

File tree

19 files changed

+148
-106
lines changed

19 files changed

+148
-106
lines changed

‎logfire/_internal/config.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020
import requests
2121
from opentelemetry import trace
22-
from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider # type: ignore
22+
from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider
2323
from opentelemetry.environment_variables import OTEL_LOGS_EXPORTER, OTEL_METRICS_EXPORTER, OTEL_TRACES_EXPORTER
2424
from opentelemetry.exporter.otlp.proto.http import Compression
25-
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter # type: ignore
25+
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
2626
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
2727
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
2828
from opentelemetry.metrics import NoOpMeterProvider, set_meter_provider
2929
from opentelemetry.propagate import get_global_textmap, set_global_textmap
30-
from opentelemetry.sdk._logs import LoggerProvider as SDKLoggerProvider, LogRecordProcessor # type: ignore
31-
from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor # type: ignore
32-
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor # type: ignore
30+
from opentelemetry.sdk._logs import LoggerProvider as SDKLoggerProvider, LogRecordProcessor
31+
from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor
32+
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor
3333
from opentelemetry.sdk.environment_variables import (
3434
OTEL_BSP_SCHEDULE_DELAY,
3535
OTEL_EXPORTER_OTLP_ENDPOINT,
@@ -111,7 +111,7 @@
111111
)
112112

113113
if TYPE_CHECKING:
114-
from opentelemetry._events import EventLoggerProvider # type: ignore
114+
from opentelemetry._events import EventLoggerProvider
115115

116116
from .main import Logfire
117117

@@ -708,7 +708,7 @@ def __init__(
708708
self._meter_provider = ProxyMeterProvider(NoOpMeterProvider())
709709
self._logger_provider = ProxyLoggerProvider(NoOpLoggerProvider())
710710
try:
711-
from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider # type: ignore
711+
from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider
712712

713713
self._event_logger_provider = SDKEventLoggerProvider(self._logger_provider) # type: ignore
714714
except ImportError:
@@ -1071,7 +1071,7 @@ def fix_pid(): # pragma: no cover
10711071
set_meter_provider(self._meter_provider)
10721072
set_logger_provider(self._logger_provider)
10731073
if self._event_logger_provider:
1074-
from opentelemetry._events import set_event_logger_provider # type: ignore
1074+
from opentelemetry._events import set_event_logger_provider
10751075

10761076
set_event_logger_provider(self._event_logger_provider)
10771077

‎logfire/_internal/exporters/console.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from textwrap import indent as indent_text
1515
from typing import Any, List, Literal, Mapping, TextIO, Tuple, cast
1616

17-
from opentelemetry.sdk._logs import LogData, LogRecord # type: ignore
18-
from opentelemetry.sdk._logs.export import LogExporter, LogExportResult # type: ignore
17+
from opentelemetry.sdk._logs import LogData, LogRecord
18+
from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
1919
from opentelemetry.sdk.trace import Event, ReadableSpan
2020
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
2121
from opentelemetry.util import types as otel_types

‎logfire/_internal/exporters/logs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from dataclasses import dataclass
22

3-
from opentelemetry.sdk._logs import LogData # type: ignore
3+
from opentelemetry.sdk._logs import LogData
44

55
import logfire
66
from logfire._internal.exporters.wrapper import WrapperLogProcessor

‎logfire/_internal/exporters/otlp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
import requests.exceptions
1414
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
15-
from opentelemetry.sdk._logs import LogData # type: ignore
16-
from opentelemetry.sdk._logs._internal.export import LogExportResult # type: ignore
15+
from opentelemetry.sdk._logs import LogData
16+
from opentelemetry.sdk._logs._internal.export import LogExportResult
1717
from opentelemetry.sdk.trace import ReadableSpan
1818
from opentelemetry.sdk.trace.export import SpanExportResult
1919
from requests import Session

‎logfire/_internal/exporters/test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
from typing import Any, Mapping, cast
1313

1414
from opentelemetry import trace
15-
from opentelemetry.sdk._logs import LogData # type: ignore
16-
from opentelemetry.sdk._logs._internal.export import LogExportResult # type: ignore
17-
from opentelemetry.sdk._logs.export import InMemoryLogExporter # type: ignore
15+
from opentelemetry.sdk._logs import LogData
16+
from opentelemetry.sdk._logs._internal.export import LogExportResult
17+
from opentelemetry.sdk._logs.export import InMemoryLogExporter
1818
from opentelemetry.sdk.trace import Event, ReadableSpan
1919
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
2020
from opentelemetry.semconv.resource import ResourceAttributes

‎logfire/_internal/exporters/wrapper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from typing import Any, Sequence, cast
55

66
from opentelemetry import context
7-
from opentelemetry.sdk._logs import LogData, LogRecordProcessor # type: ignore
8-
from opentelemetry.sdk._logs.export import LogExporter, LogExportResult # type: ignore
7+
from opentelemetry.sdk._logs import LogData, LogRecordProcessor
8+
from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
99
from opentelemetry.sdk.metrics.export import AggregationTemporality, MetricExporter, MetricExportResult, MetricsData
1010
from opentelemetry.sdk.metrics.view import Aggregation
1111
from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor

‎logfire/_internal/integrations/llm_providers/openai.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def get_response_data(self) -> Any:
108108

109109
try:
110110
# ChatCompletionStreamState only exists in openai>=1.40.0
111-
from openai.lib.streaming.chat._completions import ChatCompletionStreamState # type: ignore
111+
from openai.lib.streaming.chat._completions import ChatCompletionStreamState
112112

113113
class OpenaiChatCompletionStreamState(StreamState):
114114
def __init__(self):

‎logfire/_internal/logs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from typing import Any
88
from weakref import WeakSet
99

10-
from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider # type: ignore
10+
from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider
1111
from opentelemetry.util.types import Attributes
1212

1313

‎logfire/_internal/scrubbing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import typing_extensions
1111
from opentelemetry.attributes import BoundedAttributes
12-
from opentelemetry.sdk._logs import LogRecord # type: ignore
12+
from opentelemetry.sdk._logs import LogRecord
1313
from opentelemetry.sdk.trace import Event
1414
from opentelemetry.semconv.trace import SpanAttributes
1515
from opentelemetry.trace import Link

‎logfire/_internal/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def get_version(version: str) -> Version:
221221

222222
except ImportError: # pragma: no cover
223223
# Trigger the sys.path change mentioned below, but discard this.
224-
from setuptools._vendor.packaging.version import Version # type: ignore
224+
from setuptools._vendor.packaging.version import Version
225225

226226
try:
227227
# See https://pydanticlogfire.slack.com/archives/C06EDRBSAH3/p1722017944332959
@@ -234,7 +234,7 @@ def get_version(version: str) -> Version:
234234

235235
except ImportError:
236236
# sys.path is only changed in newer versions, so fallback to just importing the vendored Version directly.
237-
from setuptools._vendor.packaging.version import Version # type: ignore
237+
from setuptools._vendor.packaging.version import Version
238238
return Version(version) # type: ignore
239239

240240

‎logfire/testing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from dataclasses import dataclass
66

77
import pytest
8-
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor # type: ignore
8+
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
99
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
1010
from opentelemetry.sdk.trace.export import SimpleSpanProcessor
1111
from opentelemetry.sdk.trace.id_generator import IdGenerator

‎tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import anyio._backends._asyncio # noqa # type: ignore
1010
import pytest
1111
from opentelemetry import trace
12-
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor # type: ignore
12+
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
1313
from opentelemetry.sdk.metrics.export import InMemoryMetricReader
1414
from opentelemetry.sdk.trace.export import SimpleSpanProcessor
1515
from opentelemetry.sdk.trace.id_generator import IdGenerator

‎tests/otel_integrations/test_openai_agents.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ def random_number() -> int:
456456
'include_usage': None,
457457
'extra_query': None,
458458
'extra_body': None,
459+
'extra_headers': None,
459460
},
460461
'response': {
461462
'id': 'resp_67ced68228748191b31ea5d9172a7b4b',
@@ -753,6 +754,7 @@ def random_number() -> int:
753754
'include_usage': None,
754755
'extra_query': None,
755756
'extra_body': None,
757+
'extra_headers': None,
756758
},
757759
'response': {
758760
'id': 'resp_67ced68425f48191a5fb0c2b61cb27dd',
@@ -1098,6 +1100,7 @@ async def zero_guardrail(_context: Any, _agent: Agent[Any], inp: Any) -> Guardra
10981100
'include_usage': None,
10991101
'extra_query': None,
11001102
'extra_body': None,
1103+
'extra_headers': None,
11011104
},
11021105
'response': {
11031106
'id': 'resp_67cee263c6e0819184efdc0fe2624cc8',
@@ -1424,6 +1427,7 @@ async def test_chat_completions(exporter: TestExporter):
14241427
'include_usage': None,
14251428
'extra_query': None,
14261429
'extra_body': None,
1430+
'extra_headers': None,
14271431
'base_url': 'https://api.openai.com/v1/',
14281432
},
14291433
'usage': {'input_tokens': 11, 'output_tokens': 8},
@@ -1783,6 +1787,7 @@ async def test_responses_simple(exporter: TestExporter):
17831787
'include_usage': None,
17841788
'extra_query': None,
17851789
'extra_body': None,
1790+
'extra_headers': None,
17861791
},
17871792
'response': {
17881793
'id': 'resp_67ceee053cdc81919f39173ee02cb88e',
@@ -1975,6 +1980,7 @@ async def test_responses_simple(exporter: TestExporter):
19751980
'include_usage': None,
19761981
'extra_query': None,
19771982
'extra_body': None,
1983+
'extra_headers': None,
19781984
},
19791985
'response': {
19801986
'id': 'resp_67ceee0623ac819190454bc7af968938',
@@ -2227,6 +2233,7 @@ async def test_file_search(exporter: TestExporter):
22272233
'include_usage': None,
22282234
'extra_query': None,
22292235
'extra_body': None,
2236+
'extra_headers': None,
22302237
},
22312238
'response': {
22322239
'id': 'resp_67ceff39d5e88191885004de76d26e43',
@@ -2498,6 +2505,7 @@ async def test_file_search(exporter: TestExporter):
24982505
'include_usage': None,
24992506
'extra_query': None,
25002507
'extra_body': None,
2508+
'extra_headers': None,
25012509
},
25022510
'response': {
25032511
'id': 'resp_67ceff3c84548191b620a2cf4c2e37f2',
@@ -2806,6 +2814,7 @@ def tool():
28062814
'include_usage': None,
28072815
'extra_query': None,
28082816
'extra_body': None,
2817+
'extra_headers': None,
28092818
},
28102819
'gen_ai.request.model': 'gpt-4o',
28112820
'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
@@ -3038,6 +3047,7 @@ def tool():
30383047
'include_usage': None,
30393048
'extra_query': None,
30403049
'extra_body': None,
3050+
'extra_headers': None,
30413051
},
30423052
'gen_ai.request.model': 'gpt-4o',
30433053
'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):
34233433
'include_usage': None,
34243434
'extra_query': None,
34253435
'extra_body': None,
3436+
'extra_headers': None,
34263437
},
34273438
'gen_ai.request.model': 'gpt-4o',
34283439
'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',

‎tests/otel_integrations/test_openai_agents_mcp.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ async def random_number(ctx: Context) -> int: # type: ignore
6666

6767
class MyMCPServer(_MCPServerWithClientSession):
6868
def __init__(self, streams: Any):
69-
super().__init__(False)
69+
super().__init__(cache_tools_list=False, client_session_timeout_seconds=1000)
7070
self._streams = streams
7171

7272
@asynccontextmanager
@@ -322,6 +322,7 @@ def name(self):
322322
'include_usage': None,
323323
'extra_query': None,
324324
'extra_body': None,
325+
'extra_headers': None,
325326
},
326327
'gen_ai.request.model': 'gpt-4o',
327328
'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',
@@ -626,6 +627,7 @@ def name(self):
626627
'include_usage': None,
627628
'extra_query': None,
628629
'extra_body': None,
630+
'extra_headers': None,
629631
},
630632
'gen_ai.request.model': 'gpt-4o',
631633
'logfire.msg_template': 'Responses API with {gen_ai.request.model!r}',

‎tests/test_configure.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
import requests_mock
1919
from dirty_equals import IsStr
2020
from inline_snapshot import snapshot
21-
from opentelemetry._logs import get_logger_provider # type: ignore
22-
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter # type: ignore
21+
from opentelemetry._logs import get_logger_provider
22+
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
2323
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
2424
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
2525
from opentelemetry.metrics import NoOpMeterProvider, get_meter_provider
2626
from opentelemetry.propagate import get_global_textmap
2727
from opentelemetry.propagators.composite import CompositePropagator
28-
from opentelemetry.sdk._logs import LogRecordProcessor # type: ignore
29-
from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor # type: ignore
30-
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor # type: ignore
28+
from opentelemetry.sdk._logs import LogRecordProcessor
29+
from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor
30+
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor
3131
from opentelemetry.sdk.metrics.export import InMemoryMetricReader, PeriodicExportingMetricReader
3232
from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor, SynchronousMultiSpanProcessor
3333
from opentelemetry.sdk.trace.export import (

‎tests/test_console_exporter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from dirty_equals import IsStr
1010
from inline_snapshot import snapshot
1111
from opentelemetry import trace
12-
from opentelemetry._events import Event, get_event_logger # type: ignore
13-
from opentelemetry._logs import LogRecord, SeverityNumber, get_logger # type: ignore
12+
from opentelemetry._events import Event, get_event_logger
13+
from opentelemetry._logs import LogRecord, SeverityNumber, get_logger
1414
from opentelemetry.sdk.trace import ReadableSpan
1515

1616
import logfire

‎tests/test_otel_logs.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import requests.exceptions
88
from dirty_equals import IsStr
99
from inline_snapshot import snapshot
10-
from opentelemetry._events import Event, get_event_logger, get_event_logger_provider # type: ignore
11-
from opentelemetry._logs import LogRecord, SeverityNumber, get_logger, get_logger_provider # type: ignore
12-
from opentelemetry.sdk._logs import LogData # type: ignore
10+
from opentelemetry._events import Event, get_event_logger, get_event_logger_provider
11+
from opentelemetry._logs import LogRecord, SeverityNumber, get_logger, get_logger_provider
12+
from opentelemetry.sdk._logs import LogData
1313
from opentelemetry.sdk._logs.export import (
14-
InMemoryLogExporter, # type: ignore
15-
LogExporter, # type: ignore
16-
LogExportResult, # type: ignore
17-
SimpleLogRecordProcessor, # type: ignore
14+
InMemoryLogExporter,
15+
LogExporter,
16+
LogExportResult,
17+
SimpleLogRecordProcessor,
1818
)
1919
from opentelemetry.sdk.resources import Resource
2020

‎tests/test_secret_scrubbing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import pytest
88
from dirty_equals import IsJson, IsPartialDict
99
from inline_snapshot import snapshot
10-
from opentelemetry._events import Event, get_event_logger # type: ignore
11-
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor # type: ignore
10+
from opentelemetry._events import Event, get_event_logger
11+
from opentelemetry.sdk._logs.export import SimpleLogRecordProcessor
1212
from opentelemetry.sdk.environment_variables import OTEL_RESOURCE_ATTRIBUTES
1313
from opentelemetry.trace.propagation import get_current_span
1414

0 commit comments

Comments
 (0)