Fix opentelemetry compatibility with version<1.35

Author: medaminezghal

docs/logfire.md

@@ -283,7 +283,7 @@ 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_event_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 `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].
 
 ```python {title="instrumentation_settings_providers.py"}
 from opentelemetry.sdk._logs import LoggerProvider
@@ -293,7 +293,7 @@ from pydantic_ai.agent import Agent, InstrumentationSettings
 
 instrumentation_settings = InstrumentationSettings(
     tracer_provider=TracerProvider(),
-    event_logger_provider=LoggerProvider(),
+    logger_provider=LoggerProvider(),
 )
 
 agent = Agent('gpt-4o', instrument=instrumentation_settings)

pydantic_ai_slim/pydantic_ai/messages.py

@@ -78,7 +78,7 @@ class SystemPromptPart:
 
     def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
         return LogRecord(
-            event_name='gen_ai.system.message',
+            attributes={'event.name': 'gen_ai.system.message'},
             body={'role': 'system', **({'content': self.content} if settings.include_content else {})},
         )
 
@@ -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(event_name='gen_ai.user.message', body={'content': content, 'role': 'user'})
+        return LogRecord(attributes={'event.name': 'gen_ai.user.message'}, body={'content': content, 'role': 'user'})
 
     __repr__ = _utils.dataclasses_no_defaults_repr
 
@@ -485,7 +485,7 @@ def model_response_object(self) -> dict[str, Any]:
 
     def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
         return LogRecord(
-            event_name='gen_ai.tool.message',
+            attributes={'event.name': 'gen_ai.tool.message'},
             body={
                 **({'content': self.content} if settings.include_content else {}),
                 'role': 'tool',
@@ -552,10 +552,13 @@ def model_response(self) -> str:
 
     def otel_event(self, settings: InstrumentationSettings) -> LogRecord:
         if self.tool_name is None:
-            return LogRecord(event_name='gen_ai.user.message', body={'content': self.model_response(), 'role': 'user'})
+            return LogRecord(
+                attributes={'event.name': 'gen_ai.user.message'},
+                body={'content': self.model_response(), 'role': 'user'},
+            )
         else:
             return LogRecord(
-                event_name='gen_ai.tool.message',
+                attributes={'event.name': 'gen_ai.tool.message'},
                 body={
                     **({'content': self.model_response()} if settings.include_content else {}),
                     'role': 'tool',
@@ -740,7 +743,7 @@ def otel_events(self, settings: InstrumentationSettings) -> list[LogRecord]:
 
         def new_event_body():
             new_body: dict[str, Any] = {'role': 'assistant'}
-            ev = LogRecord(event_name='gen_ai.assistant.message', body=new_body)
+            ev = LogRecord(attributes={'event.name': 'gen_ai.assistant.message'}, body=new_body)
             result.append(ev)
             return new_body
 

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -158,7 +158,7 @@ def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[LogRecor
         if instructions is not None:
             events.append(
                 LogRecord(
-                    event_name='gen_ai.system.message',
+                    attributes={'event.name': 'gen_ai.system.message'},
                     body={**({'content': instructions} if self.include_content else {}), 'role': 'system'},
                 )
             )
@@ -303,7 +303,7 @@ def _record_metrics():
                     for event in self.instrumentation_settings.messages_to_otel_events([response]):
                         events.append(
                             LogRecord(
-                                event_name='gen_ai.choice',
+                                attributes={'event.name': 'gen_ai.choice'},
                                 body={
                                     # TODO finish_reason
                                     'index': 0,

tests/models/test_fallback.py

@@ -135,7 +135,7 @@ def test_first_failed_instrumented(capfire: CaptureLogfire) -> None:
                     'gen_ai.usage.input_tokens': 51,
                     'gen_ai.usage.output_tokens': 1,
                     'gen_ai.response.model': 'function:success_response:',
-                    'events': '[{"content": "hello", "role": "user", "gen_ai.system": "function", "gen_ai.message.index": 0}, {"index": 0, "message": {"role": "assistant", "content": "success"}, "gen_ai.system": "function"}]',
+                    'events': '[{"content": "hello", "role": "user", "gen_ai.system": "function", "gen_ai.message.index": 0, "event.name": "gen_ai.user.message"}, {"index": 0, "message": {"role": "assistant", "content": "success"}, "gen_ai.system": "function", "event.name": "gen_ai.choice"}]',
                     'logfire.json_schema': '{"type": "object", "properties": {"events": {"type": "array"}, "model_request_parameters": {"type": "object"}}}',
                 },
             },
@@ -151,7 +151,7 @@ def test_first_failed_instrumented(capfire: CaptureLogfire) -> None:
                     'logfire.msg': 'agent run',
                     'logfire.span_type': 'span',
                     'gen_ai.usage.input_tokens': 51,
-                    'all_messages_events': '[{"content": "hello", "role": "user", "gen_ai.message.index": 0}, {"role": "assistant", "content": "success", "gen_ai.message.index": 1}]',
+                    'all_messages_events': '[{"content": "hello", "role": "user", "gen_ai.message.index": 0, "event.name": "gen_ai.user.message"}, {"role": "assistant", "content": "success", "gen_ai.message.index": 1, "event.name": "gen_ai.assistant.message"}]',
                     'gen_ai.usage.output_tokens': 1,
                     'final_result': 'success',
                     'logfire.json_schema': '{"type": "object", "properties": {"all_messages_events": {"type": "array"}, "final_result": {"type": "object"}}}',
@@ -208,7 +208,7 @@ async def test_first_failed_instrumented_stream(capfire: CaptureLogfire) -> None
                     'gen_ai.usage.input_tokens': 50,
                     'gen_ai.usage.output_tokens': 2,
                     'gen_ai.response.model': 'function::success_response_stream',
-                    'events': '[{"content": "input", "role": "user", "gen_ai.system": "function", "gen_ai.message.index": 0}, {"index": 0, "message": {"role": "assistant", "content": "hello world"}, "gen_ai.system": "function"}]',
+                    'events': '[{"content": "input", "role": "user", "gen_ai.system": "function", "gen_ai.message.index": 0, "event.name": "gen_ai.user.message"}, {"index": 0, "message": {"role": "assistant", "content": "hello world"}, "gen_ai.system": "function", "event.name": "gen_ai.choice"}]',
                     'logfire.json_schema': '{"type": "object", "properties": {"events": {"type": "array"}, "model_request_parameters": {"type": "object"}}}',
                 },
             },
@@ -225,7 +225,7 @@ async def test_first_failed_instrumented_stream(capfire: CaptureLogfire) -> None
                     'logfire.span_type': 'span',
                     'gen_ai.usage.input_tokens': 50,
                     'gen_ai.usage.output_tokens': 2,
-                    'all_messages_events': '[{"content": "input", "role": "user", "gen_ai.message.index": 0}, {"role": "assistant", "content": "hello world", "gen_ai.message.index": 1}]',
+                    'all_messages_events': '[{"content": "input", "role": "user", "gen_ai.message.index": 0, "event.name": "gen_ai.user.message"}, {"role": "assistant", "content": "hello world", "gen_ai.message.index": 1, "event.name": "gen_ai.assistant.message"}]',
                     'logfire.json_schema': '{"type": "object", "properties": {"all_messages_events": {"type": "array"}, "final_result": {"type": "object"}}}',
                 },
             },
@@ -303,7 +303,7 @@ def test_all_failed_instrumented(capfire: CaptureLogfire) -> None:
                     'agent_name': 'agent',
                     'logfire.msg': 'agent run',
                     'logfire.span_type': 'span',
-                    'all_messages_events': '[{"content": "hello", "role": "user", "gen_ai.message.index": 0}]',
+                    'all_messages_events': '[{"content": "hello", "role": "user", "gen_ai.message.index": 0, "event.name": "gen_ai.user.message"}]',
                     'logfire.json_schema': '{"type": "object", "properties": {"all_messages_events": {"type": "array"}, "final_result": {"type": "object"}}}',
                     'logfire.level_num': 17,
                 },