Merge branch 'Arize-ai:main' into alisaleh/ticket-2037

Author: ialisaleh

.release-please-manifest.json

@@ -1,6 +1,6 @@
 {
     "python/openinference-semantic-conventions": "0.1.24",
-    "python/instrumentation/openinference-instrumentation-agno": "0.1.18",
+    "python/instrumentation/openinference-instrumentation-agno": "0.1.19",
     "python/instrumentation/openinference-instrumentation-openai": "0.1.39",
     "python/instrumentation/openinference-instrumentation-llama-index": "4.3.7",
     "python/instrumentation/openinference-instrumentation-dspy": "0.1.30",

python/instrumentation/openinference-instrumentation-agno/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.19](https://github.com/Arize-ai/openinference/compare/python-openinference-instrumentation-agno-v0.1.18...python-openinference-instrumentation-agno-v0.1.19) (2025-10-22)
+
+
+### Bug Fixes
+
+* Agno Session ID issues ([#2313](https://github.com/Arize-ai/openinference/issues/2313)) ([34402a0](https://github.com/Arize-ai/openinference/commit/34402a0a8478e1b047a76c6a885c5256cec015bc))
+
 ## [0.1.18](https://github.com/Arize-ai/openinference/compare/python-openinference-instrumentation-agno-v0.1.17...python-openinference-instrumentation-agno-v0.1.18) (2025-10-15)
 
 

python/instrumentation/openinference-instrumentation-agno/src/openinference/instrumentation/agno/__init__.py

@@ -215,20 +215,32 @@ def _uninstrument(self, **kwargs: Any) -> None:
         from agno.tools.function import FunctionCall
 
         if self._original_run_method is not None:
-            Agent.run = self._original_run_method  # type: ignore[method-assign]
+            Agent._run = self._original_run_method  # type: ignore[method-assign]
             self._original_run_method = None
+        if self._original_run_stream_method is not None:
+            Agent._run_stream = self._original_run_stream_method  # type: ignore[method-assign]
+            self._original_run_stream_method = None
 
         if self._original_arun_method is not None:
-            Agent.arun = self._original_arun_method  # type: ignore[method-assign]
+            Agent._arun = self._original_arun_method  # type: ignore[method-assign]
             self._original_arun_method = None
+        if self._original_arun_stream_method is not None:
+            Agent._arun_stream = self._original_arun_stream_method  # type: ignore[method-assign]
+            self._original_arun_stream_method = None
 
         if self._original_team_run_method is not None:
-            Team.run = self._original_team_run_method  # type: ignore[method-assign]
+            Team._run = self._original_team_run_method  # type: ignore[method-assign]
             self._original_team_run_method = None
+        if self._original_team_run_stream_method is not None:
+            Team._run_stream = self._original_team_run_stream_method  # type: ignore[method-assign]
+            self._original_team_run_stream_method = None
 
         if self._original_team_arun_method is not None:
-            Team.arun = self._original_team_arun_method  # type: ignore[method-assign]
+            Team._arun = self._original_team_arun_method  # type: ignore[method-assign]
             self._original_team_arun_method = None
+        if self._original_team_arun_stream_method is not None:
+            Team._arun_stream = self._original_team_arun_stream_method  # type: ignore[method-assign]
+            self._original_team_arun_stream_method = None
 
         if self._original_model_call_methods is not None:
             for (

python/instrumentation/openinference-instrumentation-agno/src/openinference/instrumentation/agno/_wrappers.py

@@ -2,12 +2,15 @@
 from enum import Enum
 from inspect import signature
 from secrets import token_hex
+from types import AsyncGeneratorType, GeneratorType
 from typing import (
     Any,
+    AsyncIterator,
     Awaitable,
     Callable,
     Dict,
     Iterator,
+    List,
     Mapping,
     Optional,
     OrderedDict,
@@ -20,11 +23,14 @@
 from opentelemetry import trace as trace_api
 from opentelemetry.util.types import AttributeValue
 
-from agno.agent import Agent, RunOutput
+from agno.agent import Agent
 from agno.models.base import Model
+from agno.run.agent import RunContentEvent, RunOutput, RunOutputEvent
 from agno.run.messages import RunMessages
+from agno.run.team import RunContentEvent as TeamRunContentEvent
+from agno.run.team import TeamRunOutputEvent
 from agno.team import Team
-from agno.tools.function import Function, FunctionCall
+from agno.tools.function import Function, FunctionCall, ToolResult
 from agno.tools.toolkit import Toolkit
 from openinference.instrumentation import get_attributes_from_context, safe_json_dumps
 from openinference.semconv.trace import (
@@ -210,7 +216,10 @@ def run(
         if hasattr(agent, "name") and agent.name:
             agent_name = agent.name.replace(" ", "_").replace("-", "_")
         else:
-            agent_name = "Agent"
+            if isinstance(agent, Team):
+                agent_name = "Team"
+            else:
+                agent_name = "Agent"
         span_name = f"{agent_name}.run"
 
         # Generate unique node ID for this execution
@@ -268,7 +277,10 @@ def run_stream(
         if hasattr(agent, "name") and agent.name:
             agent_name = agent.name.replace(" ", "_").replace("-", "_")
         else:
-            agent_name = "Agent"
+            if isinstance(agent, Team):
+                agent_name = "Team"
+            else:
+                agent_name = "Agent"
         span_name = f"{agent_name}.run"
 
         # Generate unique node ID for this execution
@@ -301,6 +313,7 @@ def run_stream(
                     if hasattr(response, "run_id"):
                         current_run_id = response.run_id
                     yield response
+
                 if (
                     "session" in arguments
                     and (session := arguments.get("session")) is not None
@@ -321,14 +334,20 @@ def run_stream(
                     # Extract session_id from the session object
                     session_id = None
                     try:
-                        session = arguments.get("session")
-                        if session and hasattr(session, "session_id"):
-                            session_id = session.session_id
+                        if "session" in arguments:
+                            session = arguments.get("session")
+                            if session and hasattr(session, "session_id"):
+                                session_id = session.session_id
+                        elif "session_id" in arguments:
+                            session_id = arguments.get("session_id")
                     except Exception:
                         session_id = None
 
+                    if session_id is None:
+                        session_id = agent.session_id
+
                     run_response = None
-                    if hasattr(agent, "get_last_run_output"):
+                    if hasattr(agent, "get_last_run_output") and session_id is not None:
                         run_response = agent.get_last_run_output(session_id=session_id)
 
                     span.set_status(trace_api.StatusCode.OK)
@@ -359,8 +378,11 @@ async def arun(
         if hasattr(agent, "name") and agent.name:
             agent_name = agent.name.replace(" ", "_").replace("-", "_")
         else:
-            agent_name = "Agent"
-        span_name = f"{agent_name}.run"
+            if isinstance(agent, Team):
+                agent_name = "Team"
+            else:
+                agent_name = "Agent"
+        span_name = f"{agent_name}.arun"
 
         # Generate unique node ID for this execution
         node_id = _generate_node_id()
@@ -417,8 +439,11 @@ async def arun_stream(
         if hasattr(agent, "name") and agent.name:
             agent_name = agent.name.replace(" ", "_").replace("-", "_")
         else:
-            agent_name = "Agent"
-        span_name = f"{agent_name}.run"
+            if isinstance(agent, Team):
+                agent_name = "Team"
+            else:
+                agent_name = "Agent"
+        span_name = f"{agent_name}.arun"
 
         # Generate unique node ID for this execution
         node_id = _generate_node_id()
@@ -472,14 +497,21 @@ async def arun_stream(
                     # Extract session_id from the session object
                     session_id = None
                     try:
-                        session = arguments.get("session")
-                        if session and hasattr(session, "session_id"):
-                            session_id = session.session_id
+                        if "session" in arguments:
+                            session = arguments.get("session")
+                            if session and hasattr(session, "session_id"):
+                                session_id = session.session_id
+                        elif "session_id" in arguments:
+                            session_id = arguments.get("session_id")
+
                     except Exception:
                         session_id = None
 
+                    if session_id is None:
+                        session_id = agent.session_id
+
                     run_response = None
-                    if hasattr(agent, "get_last_run_output"):
+                    if hasattr(agent, "get_last_run_output") and session_id is not None:
                         run_response = agent.get_last_run_output(session_id=session_id)
 
                     span.set_status(trace_api.StatusCode.OK)
@@ -1013,7 +1045,25 @@ def run(
             response = wrapped(*args, **kwargs)
 
             if response.status == "success":
-                function_result = function_call.result
+                function_result = ""
+                if isinstance(function_call.result, (GeneratorType, Iterator)):
+                    events = []
+                    for item in function_call.result:
+                        if isinstance(item, RunContentEvent) or isinstance(
+                            item, TeamRunContentEvent
+                        ):
+                            function_result += self._parse_content(item.content)
+                        else:
+                            function_result += str(item)
+                        events.append(item)
+
+                    # Convert back to iterator for downstream use
+                    function_call.result = self._generator_wrapper(events)
+                    response.result = function_call.result
+                elif isinstance(function_call.result, ToolResult):
+                    function_result = function_call.result.content
+                else:
+                    function_result = function_call.result
                 span.set_status(trace_api.StatusCode.OK)
                 span.set_attributes(
                     dict(
@@ -1061,7 +1111,38 @@ async def arun(
             response = await wrapped(*args, **kwargs)
 
             if response.status == "success":
-                function_result = function_call.result
+                function_result = ""
+                if isinstance(function_call.result, (AsyncGeneratorType, AsyncIterator)):
+                    events = []
+                    async for item in function_call.result:
+                        if isinstance(item, RunContentEvent) or isinstance(
+                            item, TeamRunContentEvent
+                        ):
+                            function_result += self._parse_content(item.content)
+                        else:
+                            function_result += str(item)
+                        events.append(item)
+                    # Convert back to iterator for downstream use
+                    function_call.result = self._async_generator_wrapper(events)
+                    response.result = function_call.result
+                elif isinstance(function_call.result, (GeneratorType, Iterator)):
+                    events = []
+                    for item in function_call.result:
+                        if isinstance(item, RunContentEvent) or isinstance(
+                            item, TeamRunContentEvent
+                        ):
+                            function_result += self._parse_content(item.content)
+                        else:
+                            function_result += str(item)
+                        events.append(item)
+                    # Convert back to iterator for downstream use
+                    function_call.result = self._generator_wrapper(events)
+                    response.result = function_call.result
+                elif isinstance(function_call.result, ToolResult):
+                    function_result = function_call.result.content
+                else:
+                    function_result = function_call.result
+
                 span.set_status(trace_api.StatusCode.OK)
                 span.set_attributes(
                     dict(
@@ -1080,6 +1161,29 @@ async def arun(
 
         return response
 
+    def _generator_wrapper(
+        self,
+        events: List[Union[RunOutputEvent, TeamRunOutputEvent]],
+    ) -> Iterator[Union[RunOutputEvent, TeamRunOutputEvent]]:
+        for event in events:
+            yield event
+
+    async def _async_generator_wrapper(
+        self,
+        events: List[Union[RunOutputEvent, TeamRunOutputEvent]],
+    ) -> AsyncIterator[Union[RunOutputEvent, TeamRunOutputEvent]]:
+        for event in events:
+            yield event
+
+    def _parse_content(self, content: Any) -> str:
+        from pydantic import BaseModel
+
+        if content is not None and isinstance(content, BaseModel):
+            return str(content.model_dump_json())
+        else:
+            # Capture output
+            return str(content) if content else ""
+
 
 # span attributes
 INPUT_MIME_TYPE = SpanAttributes.INPUT_MIME_TYPE

python/instrumentation/openinference-instrumentation-agno/src/openinference/instrumentation/agno/version.py

@@ -1 +1 @@
-__version__ = "0.1.18"
+__version__ = "0.1.19"