Fix conflicts with main

Author: medaminezghal

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -157,7 +157,10 @@ def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[LogRecor
         instructions = InstrumentedModel._get_instructions(messages)  # pyright: ignore [reportPrivateUsage]
         if instructions is not None:
             events.append(
-                LogRecord(event_name='gen_ai.system.message', body={'content': instructions, 'role': 'system'})
+                LogRecord(
+                    event_name='gen_ai.system.message',
+                    body={**({'content': instructions} if self.include_content else {}), 'role': 'system'},
+                )
             )
 
         for message_index, message in enumerate(messages):

tests/test_logfire.py

@@ -409,7 +409,7 @@ class MyOutput:
             'all_messages_events': IsJson(
                 snapshot(
                     [
-                        {'content': 'Here are some instructions', 'role': 'system'},
+                        {'role': 'system'},
                         {'content': {'kind': 'text'}, 'role': 'user', 'gen_ai.message.index': 0},
                         {
                             'role': 'assistant',
@@ -442,7 +442,7 @@ class MyOutput:
         IsJson(
             snapshot(
                 [
-                    {'content': 'Here are some instructions', 'role': 'system', 'gen_ai.system': 'test'},
+                    {'role': 'system', 'gen_ai.system': 'test'},
                     {
                         'content': {'kind': 'text'},
                         'role': 'user',