Upgrade pyright, fix private imports (#964)

Author: alexmojaki

logfire/_internal/config.py

@@ -19,17 +19,17 @@
 
 import requests
 from opentelemetry import trace
-from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider
+from opentelemetry._logs import NoOpLoggerProvider, set_logger_provider  # type: ignore
 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
+from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter  # type: ignore
 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
-from opentelemetry.sdk._logs._internal import SynchronousMultiLogRecordProcessor
-from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, SimpleLogRecordProcessor
+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.environment_variables import (
     OTEL_BSP_SCHEDULE_DELAY,
     OTEL_EXPORTER_OTLP_ENDPOINT,
@@ -106,7 +106,7 @@
 )
 
 if TYPE_CHECKING:
-    from opentelemetry._events import EventLoggerProvider
+    from opentelemetry._events import EventLoggerProvider  # type: ignore
 
     from .main import Logfire
 
@@ -703,7 +703,7 @@ def __init__(
         self._meter_provider = ProxyMeterProvider(NoOpMeterProvider())
         self._logger_provider = ProxyLoggerProvider(NoOpLoggerProvider())
         try:
-            from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider
+            from opentelemetry.sdk._events import EventLoggerProvider as SDKEventLoggerProvider  # type: ignore
 
             self._event_logger_provider = SDKEventLoggerProvider(self._logger_provider)  # type: ignore
         except ImportError:
@@ -1066,7 +1066,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
+                    from opentelemetry._events import set_event_logger_provider  # type: ignore
 
                     set_event_logger_provider(self._event_logger_provider)
 

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
-from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
+from opentelemetry.sdk._logs import LogData, LogRecord  # type: ignore
+from opentelemetry.sdk._logs.export import LogExporter, LogExportResult  # type: ignore
 from opentelemetry.sdk.trace import Event, ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.util import types as otel_types

logfire/_internal/exporters/logs.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from opentelemetry.sdk._logs import LogData
+from opentelemetry.sdk._logs import LogData  # type: ignore
 
 import logfire
 from logfire._internal.exporters.wrapper import WrapperLogProcessor

logfire/_internal/exporters/otlp.py

@@ -12,8 +12,8 @@
 from typing import Any, Mapping, Sequence
 
 import requests.exceptions
-from opentelemetry.sdk._logs import LogData
-from opentelemetry.sdk._logs._internal.export import LogExportResult
+from opentelemetry.sdk._logs import LogData  # type: ignore
+from opentelemetry.sdk._logs._internal.export import LogExportResult  # type: ignore
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExportResult
 from requests import Session

logfire/_internal/exporters/processor_wrapper.py

@@ -194,7 +194,7 @@ def _tweak_http_spans(span: ReadableSpanDict):
     method = attributes.get(SpanAttributes.HTTP_METHOD)
     route = attributes.get(SpanAttributes.HTTP_ROUTE)
     target = attributes.get(SpanAttributes.HTTP_TARGET)
-    url = attributes.get(SpanAttributes.HTTP_URL)
+    url: Any = attributes.get(SpanAttributes.HTTP_URL)
     if not (method or route or target or url):
         return
 
@@ -225,7 +225,7 @@ def _tweak_http_spans(span: ReadableSpanDict):
             )
             if not server_name:
                 try:
-                    server_name = urlparse(url).hostname  # type: ignore
+                    server_name = urlparse(url).hostname
                 except Exception:  # pragma: no cover
                     pass
             server_name = server_name or url

logfire/_internal/exporters/quiet_metrics.py

@@ -1,8 +1,7 @@
 from typing import Any
 
 import requests
-from opentelemetry.sdk.metrics._internal.export import MetricExportResult
-from opentelemetry.sdk.metrics._internal.point import MetricsData
+from opentelemetry.sdk.metrics.export import MetricExportResult, MetricsData
 
 from .wrapper import WrapperMetricExporter
 

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
-from opentelemetry.sdk._logs._internal.export import LogExportResult
-from opentelemetry.sdk._logs.export import InMemoryLogExporter
+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.trace import Event, ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.semconv.resource import ResourceAttributes

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
-from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
+from opentelemetry.sdk._logs import LogData, LogRecordProcessor  # type: ignore
+from opentelemetry.sdk._logs.export import LogExporter, LogExportResult  # type: ignore
 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

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
+    from openai.lib.streaming.chat._completions import ChatCompletionStreamState  # type: ignore
 
     class OpenaiChatCompletionStreamState(StreamState):
         def __init__(self):

logfire/_internal/logs.py

@@ -7,7 +7,7 @@
 from typing import Any
 from weakref import WeakSet
 
-from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider
+from opentelemetry._logs import Logger, LoggerProvider, LogRecord, NoOpLoggerProvider  # type: ignore
 from opentelemetry.util.types import Attributes