Fix include_content not working as expected (pydantic#2206)

Author: adtyavrdhn

pydantic_ai_slim/pydantic_ai/agent.py

@@ -843,14 +843,15 @@ async def get_instructions(run_context: RunContext[AgentDepsT]) -> str | None:
                 agent_run = AgentRun(graph_run)
                 yield agent_run
                 if (final_result := agent_run.result) is not None and run_span.is_recording():
-                    run_span.set_attribute(
-                        'final_result',
-                        (
-                            final_result.output
-                            if isinstance(final_result.output, str)
-                            else json.dumps(InstrumentedModel.serialize_any(final_result.output))
-                        ),
-                    )
+                    if instrumentation_settings and instrumentation_settings.include_content:
+                        run_span.set_attribute(
+                            'final_result',
+                            (
+                                final_result.output
+                                if isinstance(final_result.output, str)
+                                else json.dumps(InstrumentedModel.serialize_any(final_result.output))
+                            ),
+                        )
         finally:
             try:
                 if instrumentation_settings and run_span.is_recording():

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -156,7 +156,12 @@ def messages_to_otel_events(self, messages: list[ModelMessage]) -> list[Event]:
         events: list[Event] = []
         instructions = InstrumentedModel._get_instructions(messages)  # pyright: ignore [reportPrivateUsage]
         if instructions is not None:
-            events.append(Event('gen_ai.system.message', body={'content': instructions, 'role': 'system'}))
+            events.append(
+                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[Event] = []

tests/test_logfire.py

@@ -448,7 +448,6 @@ class MyOutput:
                 snapshot(
                     [
                         {
-                            'content': 'Here are some instructions',
                             'role': 'system',
                             'event.name': 'gen_ai.system.message',
                         },
@@ -480,7 +479,6 @@ class MyOutput:
                     ]
                 )
             ),
-            'final_result': '{"content": "a"}',
             'logfire.json_schema': IsJson(
                 snapshot(
                     {
@@ -497,7 +495,6 @@ class MyOutput:
             snapshot(
                 [
                     {
-                        'content': 'Here are some instructions',
                         'role': 'system',
                         'gen_ai.system': 'test',
                         'event.name': 'gen_ai.system.message',