Drop Python 3.8 support (#1122)

Author: alexmojaki

logfire/_internal/async_.py

@@ -4,10 +4,10 @@
 import asyncio.events
 import asyncio.tasks
 import inspect
-from contextlib import contextmanager
+from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
 from types import CoroutineType
-from typing import TYPE_CHECKING, Any, ContextManager
+from typing import TYPE_CHECKING, Any
 
 from .constants import ONE_SECOND_IN_NANOSECONDS
 from .stack_info import StackInfo, get_code_object_info, get_stack_info_from_frame
@@ -19,7 +19,7 @@
 ASYNCIO_PATH = str(Path(asyncio.__file__).parent.absolute())
 
 
-def log_slow_callbacks(logfire: Logfire, slow_duration: float) -> ContextManager[None]:
+def log_slow_callbacks(logfire: Logfire, slow_duration: float) -> AbstractContextManager[None]:
     """Log a warning whenever a function running in the asyncio event loop blocks for too long.
 
     See Logfire.log_slow_async_callbacks.

logfire/_internal/auto_trace/__init__.py

@@ -2,7 +2,8 @@
 
 import sys
 import warnings
-from typing import TYPE_CHECKING, Callable, Literal, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Callable, Literal
 
 from ..constants import ONE_SECOND_IN_NANOSECONDS
 from .import_hook import LogfireFinder

logfire/_internal/auto_trace/import_hook.py

@@ -2,12 +2,13 @@
 
 import ast
 import sys
+from collections.abc import Iterator, Sequence
 from dataclasses import dataclass
 from importlib.abc import Loader, MetaPathFinder
 from importlib.machinery import ModuleSpec
 from importlib.util import spec_from_loader
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Sequence, cast
+from typing import TYPE_CHECKING, Any, Callable, cast
 
 from ..utils import log_internal_error
 from .rewrite_ast import compile_source

logfire/_internal/auto_trace/rewrite_ast.py

@@ -3,9 +3,10 @@
 import ast
 import uuid
 from collections import deque
+from contextlib import AbstractContextManager
 from dataclasses import dataclass
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, ContextManager, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, TypeVar
 
 import logfire
 
@@ -35,7 +36,7 @@ def compile_source(
     Otherwise, it's initially the `partial` above.
     """
     logfire_name = f'logfire_{uuid.uuid4().hex}'
-    context_factories: list[Callable[[], ContextManager[Any]]] = []
+    context_factories: list[Callable[[], AbstractContextManager[Any]]] = []
     tree = rewrite_ast(tree, filename, logfire_name, module_name, logfire_instance, context_factories, min_duration)
     assert isinstance(tree, ast.Module)  # for type checking
     # dont_inherit=True is necessary to prevent the module from inheriting the __future__ import from this module.
@@ -54,7 +55,7 @@ def rewrite_ast(
     logfire_name: str,
     module_name: str,
     logfire_instance: Logfire,
-    context_factories: list[Callable[[], ContextManager[Any]]],
+    context_factories: list[Callable[[], AbstractContextManager[Any]]],
     min_duration: int,
 ) -> ast.AST:
     logfire_args = LogfireArgs(logfire_instance._tags, logfire_instance._sample_rate)  # type: ignore
@@ -69,7 +70,7 @@ class AutoTraceTransformer(BaseTransformer):
     """Trace all encountered functions except those explicitly marked with `@no_auto_trace`."""
 
     logfire_instance: Logfire
-    context_factories: list[Callable[[], ContextManager[Any]]]
+    context_factories: list[Callable[[], AbstractContextManager[Any]]]
     min_duration: int
 
     def check_no_auto_trace(self, node: ast.FunctionDef | ast.AsyncFunctionDef | ast.ClassDef) -> bool:

logfire/_internal/auto_trace/types.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import re
+from collections.abc import Sequence
 from dataclasses import dataclass
-from typing import Sequence
 
 
 @dataclass

logfire/_internal/cli.py

@@ -11,9 +11,10 @@
 import sys
 import warnings
 import webbrowser
+from collections.abc import Sequence
 from operator import itemgetter
 from pathlib import Path
-from typing import Any, Sequence, cast
+from typing import Any, cast
 from urllib.parse import urlparse
 
 import requests

logfire/_internal/config.py

@@ -9,11 +9,12 @@
 import sys
 import time
 import warnings
+from collections.abc import Sequence
 from contextlib import suppress
 from dataclasses import dataclass, field
 from pathlib import Path
 from threading import RLock, Thread
-from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence, TypedDict, cast
+from typing import TYPE_CHECKING, Any, Callable, Literal, TypedDict, cast
 from urllib.parse import urljoin
 from uuid import uuid4
 

logfire/_internal/config_params.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Callable, Literal, Set, TypeVar, Union
+from typing import Any, Callable, Literal, TypeVar, Union
 
 from opentelemetry.sdk.environment_variables import OTEL_SERVICE_NAME
 from typing_extensions import get_args, get_origin
@@ -88,9 +88,9 @@ class _DefaultCallback:
 """Whether to enable/disable the console exporter."""
 PYDANTIC_PLUGIN_RECORD = ConfigParam(env_vars=['LOGFIRE_PYDANTIC_PLUGIN_RECORD'], allow_file_config=True, default='off', tp=PydanticPluginRecordValues)
 """Whether instrument Pydantic validation.."""
-PYDANTIC_PLUGIN_INCLUDE = ConfigParam(env_vars=['LOGFIRE_PYDANTIC_PLUGIN_INCLUDE'], allow_file_config=True, default=set(), tp=Set[str])
+PYDANTIC_PLUGIN_INCLUDE = ConfigParam(env_vars=['LOGFIRE_PYDANTIC_PLUGIN_INCLUDE'], allow_file_config=True, default=set(), tp=set[str])
 """Set of items that should be included in Logfire Pydantic plugin instrumentation."""
-PYDANTIC_PLUGIN_EXCLUDE = ConfigParam(env_vars=['LOGFIRE_PYDANTIC_PLUGIN_EXCLUDE'], allow_file_config=True, default=set(), tp=Set[str])
+PYDANTIC_PLUGIN_EXCLUDE = ConfigParam(env_vars=['LOGFIRE_PYDANTIC_PLUGIN_EXCLUDE'], allow_file_config=True, default=set(), tp=set[str])
 """Set of items that should be excluded from Logfire Pydantic plugin instrumentation."""
 TRACE_SAMPLE_RATE = ConfigParam(env_vars=['LOGFIRE_TRACE_SAMPLE_RATE', 'OTEL_TRACES_SAMPLER_ARG'], allow_file_config=True, default=1.0, tp=float)
 """Head sampling rate for traces."""

logfire/_internal/db_statement_summary.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Mapping
+from collections.abc import Mapping
+from typing import Any
 
 MAX_QUERY_MESSAGE_LENGTH = 80
 

logfire/_internal/exporters/console.py

@@ -8,11 +8,11 @@
 import json
 import os
 import sys
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from textwrap import indent as indent_text
-from typing import Any, List, Literal, Mapping, TextIO, Tuple, cast
+from typing import Any, Literal, TextIO, cast
 
 from opentelemetry.sdk._logs import LogData, LogRecord
 from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
@@ -46,7 +46,7 @@
 
 # A list of (text, style) pairs that can be passed to rich's `Text.assemble`.
 # When logging without colors, just the text is used in a plain `print`.
-TextParts = List[Tuple[str, str]]
+TextParts = list[tuple[str, str]]
 
 
 @dataclass