Revert Otel Upgrade

Author: medaminezghal

docs/logfire.md

@@ -283,17 +283,17 @@ Note that the OpenTelemetry Semantic Conventions are still experimental and are
 
 ### Setting OpenTelemetry SDK providers
 
-By default, the global `TracerProvider` and `LoggerProvider` are used. These are set automatically by `logfire.configure()`. They can also be set by the `set_tracer_provider` and `set_logger_provider` functions in the OpenTelemetry Python SDK. You can set custom providers with [`InstrumentationSettings`][pydantic_ai.models.instrumented.InstrumentationSettings].
+By default, the global `TracerProvider` and `EventLoggerProvider` are used. These are set automatically by `logfire.configure()`. They can also be set by the `set_tracer_provider` and `set_event_logger_provider` functions in the OpenTelemetry Python SDK. You can set custom providers with [`InstrumentationSettings`][pydantic_ai.models.instrumented.InstrumentationSettings].
 
 ```python {title="instrumentation_settings_providers.py"}
-from opentelemetry.sdk._logs import LoggerProvider
+from opentelemetry.sdk._events import EventLoggerProvider
 from opentelemetry.sdk.trace import TracerProvider
 
 from pydantic_ai.agent import Agent, InstrumentationSettings
 
 instrumentation_settings = InstrumentationSettings(
     tracer_provider=TracerProvider(),
-    logger_provider=LoggerProvider(),
+    event_logger_provider=EventLoggerProvider(),
 )
 
 agent = Agent('gpt-4o', instrument=instrumentation_settings)

pydantic_ai_slim/pydantic_ai/messages.py

@@ -10,7 +10,7 @@
 
 import pydantic
 import pydantic_core
-from opentelemetry._logs import LogRecord  # pyright: ignore[reportPrivateImportUsage]
+from opentelemetry._events import Event  # pyright: ignore[reportPrivateImportUsage]
 from typing_extensions import TypeAlias, deprecated
 
 from . import _utils
@@ -76,9 +76,9 @@ class SystemPromptPart:
     part_kind: Literal['system-prompt'] = 'system-prompt'
     """Part type identifier, this is available on all parts as a discriminator."""
 
-    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
-        return LogRecord(
-            attributes={'event.name': 'gen_ai.system.message'},
+    def otel_event(self, settings: InstrumentationSettings) -> Event:
+        return Event(
+            'gen_ai.system.message',
             body={'role': 'system', **({'content': self.content} if settings.include_content else {})},
         )
 
@@ -418,7 +418,7 @@ class UserPromptPart:
     part_kind: Literal['user-prompt'] = 'user-prompt'
     """Part type identifier, this is available on all parts as a discriminator."""
 
-    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
+    def otel_event(self, settings: InstrumentationSettings) -> Event:
         content: str | list[dict[str, Any] | str] | dict[str, Any]
         if isinstance(self.content, str):
             content = self.content if settings.include_content else {'kind': 'text'}
@@ -436,7 +436,7 @@ def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
                     content.append(converted_part)
                 else:
                     content.append({'kind': part.kind})  # pragma: no cover
-        return LogRecord(attributes={'event.name': 'gen_ai.user.message'}, body={'content': content, 'role': 'user'})
+        return Event('gen_ai.user.message', body={'content': content, 'role': 'user'})
 
     __repr__ = _utils.dataclasses_no_defaults_repr
 
@@ -483,9 +483,9 @@ def model_response_object(self) -> dict[str, Any]:
         else:
             return {'return_value': tool_return_ta.dump_python(self.content, mode='json')}
 
-    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
-        return LogRecord(
-            attributes={'event.name': 'gen_ai.tool.message'},
+    def otel_event(self, settings: InstrumentationSettings) -> Event:
+        return Event(
+            'gen_ai.tool.message',
             body={
                 **({'content': self.content} if settings.include_content else {}),
                 'role': 'tool',
@@ -550,15 +550,12 @@ def model_response(self) -> str:
             description = f'{len(self.content)} validation errors: {json_errors.decode()}'
         return f'{description}\n\nFix the errors and try again.'
 
-    def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
+    def otel_event(self, settings: InstrumentationSettings) -> Event:
         if self.tool_name is None:
-            return LogRecord(
-                attributes={'event.name': 'gen_ai.user.message'},
-                body={'content': self.model_response(), 'role': 'user'},
-            )
+            return Event('gen_ai.user.message', body={'content': self.model_response(), 'role': 'user'})
         else:
-            return LogRecord(
-                attributes={'event.name': 'gen_ai.tool.message'},
+            return Event(
+                'gen_ai.tool.message',
                 body={
                     **({'content': self.model_response()} if settings.include_content else {}),
                     'role': 'tool',
@@ -737,13 +734,13 @@ class ModelResponse:
     vendor_id: str | None = None
     """Vendor ID as specified by the model provider. This can be used to track the specific request to the model."""
 
-    def otel_events(self, settings: InstrumentationSettings) -> list[LogRecord]:
+    def otel_events(self, settings: InstrumentationSettings) -> list[Event]:
         """Return OpenTelemetry events for the response."""
-        result: list[LogRecord] = []
+        result: list[Event] = []
 
         def new_event_body():
             new_body: dict[str, Any] = {'role': 'assistant'}
-            ev = LogRecord(attributes={'event.name': 'gen_ai.assistant.message'}, body=new_body)
+            ev = Event('gen_ai.assistant.message', body=new_body)
             result.append(ev)
             return new_body
 

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -8,17 +8,11 @@
 from urllib.parse import urlparse
 
 from opentelemetry._events import (
+    Event,  # pyright: ignore[reportPrivateImportUsage]
     EventLogger,  # pyright: ignore[reportPrivateImportUsage]
     EventLoggerProvider,  # pyright: ignore[reportPrivateImportUsage]
-    Event,  # pyright: ignore[reportPrivateImportUsage]
     get_event_logger_provider,  # pyright: ignore[reportPrivateImportUsage]
 )
-from opentelemetry._logs import (
-    Logger,  # pyright: ignore[reportPrivateImportUsage]
-    LoggerProvider,  # pyright: ignore[reportPrivateImportUsage]
-    LogRecord,  # pyright: ignore[reportPrivateImportUsage]
-    get_logger_provider,  # pyright: ignore[reportPrivateImportUsage]
-)
 from opentelemetry.metrics import MeterProvider, get_meter_provider
 from opentelemetry.trace import Span, Tracer, TracerProvider, get_tracer_provider
 from opentelemetry.util.types import AttributeValue
@@ -86,7 +80,7 @@ class InstrumentationSettings:
     """
 
     tracer: Tracer = field(repr=False)
-    event_logger: Logger = field(repr=False)
+    event_logger: EventLogger = field(repr=False)
     event_mode: Literal['attributes', 'logs'] = 'attributes'
     include_binary_content: bool = True
 
@@ -96,7 +90,7 @@ def __init__(
         event_mode: Literal['attributes', 'logs'] = 'attributes',
         tracer_provider: TracerProvider | None = None,
         meter_provider: MeterProvider | None = None,
-        event_logger_provider: LoggerProvider | EventLoggerProvider | None = None,
+        event_logger_provider: EventLoggerProvider | None = None,
         include_binary_content: bool = True,
         include_content: bool = True,
     ):
@@ -123,15 +117,11 @@ def __init__(
 
         tracer_provider = tracer_provider or get_tracer_provider()
         meter_provider = meter_provider or get_meter_provider()
-        event_logger_provider = event_logger_provider or get_logger_provider()
+        event_logger_provider = event_logger_provider or get_event_logger_provider()
         scope_name = 'pydantic-ai'
         self.tracer = tracer_provider.get_tracer(scope_name, __version__)
         self.meter = meter_provider.get_meter(scope_name, __version__)
-        try:
-            self.event_logger = event_logger_provider.get_logger(scope_name, __version__)
-        except AttributeError:
-            # Older OTel/logfire versions don't support LoggerProvider
-            self.event_logger = event_logger_provider.get_event_logger(scope_name, __version__)
+        self.event_logger = event_logger_provider.get_event_logger(scope_name, __version__)
         self.event_mode = event_mode
         self.include_binary_content = include_binary_content
         self.include_content = include_content
@@ -154,7 +144,7 @@ def __init__(
                 **tokens_histogram_kwargs,  # pyright: ignore
             )
 
-    def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[LogRecord]:
+    def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[Event]:
         """Convert a list of model messages to OpenTelemetry events.
 
         Args:
@@ -163,18 +153,18 @@ def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[LogRecor
         Returns:
             A list of OpenTelemetry events.
         """
-        events: list[LogRecord] = []
+        events: list[Event] = []
         instructions = InstrumentedModel._get_instructions(messages)  # pyright: ignore [reportPrivateUsage]
         if instructions is not None:
             events.append(
-                LogRecord(
-                    attributes={'event.name': 'gen_ai.system.message'},
+                Event(
+                    'gen_ai.system.message',
                     body={**({'content': instructions} if self.include_content else {}), 'role': 'system'},
                 )
             )
 
         for message_index, message in enumerate(messages):
-            message_events: list[LogRecord] = []
+            message_events: list[Event] = []
             if isinstance(message, ModelRequest):
                 for part in message.parts:
                     if hasattr(part, 'otel_event'):
@@ -312,8 +302,8 @@ def _record_metrics():
                     events = self.instrumentation_settings.messages_to_otel_events(messages)
                     for event in self.instrumentation_settings.messages_to_otel_events([response]):
                         events.append(
-                            LogRecord(
-                                attributes={'event.name': 'gen_ai.choice'},
+                            Event(
+                                'gen_ai.choice',
                                 body={
                                     # TODO finish_reason
                                     'index': 0,
@@ -342,7 +332,7 @@ def _record_metrics():
                 # to prevent them from being redundantly recorded in the span itself by logfire.
                 record_metrics()
 
-    def _emit_events(self, span: Span, events: list[LogRecord] | list[LogRecord]) -> None:
+    def _emit_events(self, span: Span, events: list[Event]) -> None:
         if self.instrumentation_settings.event_mode == 'logs':
             for event in events:
                 self.instrumentation_settings.event_logger.emit(event)
@@ -383,11 +373,11 @@ def model_attributes(model: Model):
         return attributes
 
     @staticmethod
-    def event_to_dict(event: LogRecord) -> dict[str, Any]:
+    def event_to_dict(event: Event) -> dict[str, Any]:
         if not event.body:
             body = {}  # pragma: no cover
         elif isinstance(event.body, Mapping):
-            body = event.body
+            body = event.body  # type: ignore
         else:
             body = {'body': event.body}
         return {**body, **(event.attributes or {})}

tests/models/test_fallback.py

@@ -277,7 +277,6 @@ def test_all_failed_instrumented(capfire: CaptureLogfire) -> None:
                     'logfire.span_type': 'span',
                     'logfire.msg': 'chat fallback:function:failure_response:,function:failure_response:',
                     'logfire.level_num': 17,
-                    'gen_ai.response.model': 'fallback:function:failure_response:,function:failure_response:',
                 },
                 'events': [
                     {