Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

CHANGELOG.md

@@ -63,6 +63,14 @@ for your feedback. How was the migration? Is everything working as expected? Is
 *nothing* working as expected? Something in between? Please let us know
 [on GitHub](https://github.com/getsentry/sentry-python/discussions/3936) or
 [on Discord](https://discord.com/invite/Ww9hbqr).
+
+## 2.35.1
+
+### Various fixes & improvements
+
+- OpenAI Agents: Isolate agent run (#4720) by @sentrivana
+- Tracing: Do not attach stacktrace to transaction (#4713) by @Zylphrex
+
 ## 2.35.0
 
 ### Various fixes & improvements

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -3,15 +3,13 @@
 from functools import wraps
 
 from sentry_sdk.integrations import DidNotEnable
-
 from ..spans import invoke_agent_span, update_invoke_agent_span, handoff_span
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Any, Optional
 
-
 try:
     import agents
 except ImportError:

sentry_sdk/integrations/openai_agents/patches/runner.py

@@ -23,20 +23,23 @@ def _create_run_wrapper(original_func: Callable[..., Any]) -> Callable[..., Any]
 
     @wraps(original_func)
     async def wrapper(*args: Any, **kwargs: Any) -> Any:
-        agent = args[0]
-        with agent_workflow_span(agent):
-            result = None
-            try:
-                result = await original_func(*args, **kwargs)
-                return result
-            except Exception as exc:
-                _capture_exception(exc)
-
-                # It could be that there is a "invoke agent" span still open
-                span = sentry_sdk.get_current_span()
-                if span is not None and span.timestamp is None:
-                    span.__exit__(None, None, None)
-
-                raise exc from None
+        # Isolate each workflow so that when agents are run in asyncio tasks they
+        # don't touch each other's scopes
+        with sentry_sdk.isolation_scope():
+            agent = args[0]
+            with agent_workflow_span(agent):
+                result = None
+                try:
+                    result = await original_func(*args, **kwargs)
+                    return result
+                except Exception as exc:
+                    _capture_exception(exc)
+
+                    # It could be that there is a "invoke agent" span still open
+                    current_span = sentry_sdk.get_current_span()
+                    if current_span is not None and current_span.timestamp is None:
+                        current_span.__exit__(None, None, None)
+
+                    raise exc from None
 
     return wrapper

tests/integrations/openai_agents/test_openai_agents.py

@@ -1,3 +1,4 @@
+import asyncio
 import re
 import pytest
 from unittest.mock import MagicMock, patch
@@ -86,7 +87,7 @@ def test_agent_custom_model() -> Agent:
         name="test_agent_custom_model",
         instructions="You are a helpful test assistant.",
         # the model could be agents.OpenAIChatCompletionsModel()
-        model=MagicMock(spec=agents.Model, model="my-custom-model"),
+        model="my-custom-model",
         model_settings=ModelSettings(
             max_tokens=100,
             temperature=0.7,
@@ -650,3 +651,45 @@ async def test_error_handling(sentry_init, capture_events, test_agent):
     assert ai_client_span["description"] == "chat gpt-4"
     assert ai_client_span["origin"] == "auto.ai.openai_agents"
     assert ai_client_span["status"] == "internal_error"
+
+
+@pytest.mark.asyncio
+async def test_multiple_agents_asyncio(
+    sentry_init, capture_events, test_agent, mock_model_response
+):
+    """
+    Test that multiple agents can be run at the same time in asyncio tasks
+    without interfering with each other.
+    """
+
+    with patch.dict(os.environ, {"OPENAI_API_KEY": "test-key"}):
+        with patch(
+            "agents.models.openai_responses.OpenAIResponsesModel.get_response"
+        ) as mock_get_response:
+            mock_get_response.return_value = mock_model_response
+
+            sentry_init(
+                integrations=[OpenAIAgentsIntegration()],
+                traces_sample_rate=1.0,
+            )
+
+            events = capture_events()
+
+            async def run():
+                await agents.Runner.run(
+                    starting_agent=test_agent,
+                    input="Test input",
+                    run_config=test_run_config,
+                )
+
+            await asyncio.gather(*[run() for _ in range(3)])
+
+    assert len(events) == 3
+    txn1, txn2, txn3 = events
+
+    assert txn1["type"] == "transaction"
+    assert txn1["transaction"] == "test_agent workflow"
+    assert txn2["type"] == "transaction"
+    assert txn2["transaction"] == "test_agent workflow"
+    assert txn3["type"] == "transaction"
+    assert txn3["transaction"] == "test_agent workflow"

tox.ini

@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-08-25T14:58:55.582712+00:00
+# Last generated: 2025-08-26T08:59:42.512502+00:00
 
 [tox]
 requires =
@@ -159,6 +159,10 @@ envlist =
     {py3.7,py3.10,py3.11}-pymongo-v3.13.0
     {py3.7,py3.9,py3.10}-pymongo-v4.0.2
     {py3.9,py3.12,py3.13}-pymongo-v4.14.1
+    {py3.6}-pymongo-v3.5.1
+    {py3.6,py3.10,py3.11}-pymongo-v3.13.0
+    {py3.6,py3.9,py3.10}-pymongo-v4.0.2
+    {py3.9,py3.12,py3.13}-pymongo-v4.14.0
 
     {py3.7}-redis_py_cluster_legacy-v2.0.0
     {py3.7,py3.8}-redis_py_cluster_legacy-v2.1.3