Merge branch 'potel-base' into ivana/potel/disabled-span-origins

Author: sentrivana

.github/workflows/test-integrations-ai.yml

@@ -59,6 +59,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-latest"
+      - name: Test openai_agents latest
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai_agents-latest"
       - name: Test huggingface_hub latest
         run: |
           set -x # print commands that are executed
@@ -121,6 +125,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai"
+      - name: Test openai_agents pinned
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai_agents"
       - name: Test huggingface_hub pinned
         run: |
           set -x # print commands that are executed

requirements-aws-lambda-layer.txt

@@ -1,9 +1,10 @@
 certifi
-
-# In Lambda functions botocore is used, and botocore is not
-# yet supporting urllib3 1.27.0 never mind 2+.
+urllib3
+# In Lambda functions botocore is used, and botocore has
+# restrictions on urllib3
+# https://github.com/boto/botocore/blob/develop/setup.cfg
 # So we pin this here to make our Lambda layer work with
 # Lambda Function using Python 3.7+
-urllib3<1.27
+urllib3<1.27; python_version < "3.10"
 
 opentelemetry-distro>=0.35b0

scripts/generate-test-files.sh

@@ -6,12 +6,13 @@ set -xe
 
 cd "$(dirname "$0")"
 
+rm -rf toxgen.venv
 python -m venv toxgen.venv
 . toxgen.venv/bin/activate
 
-pip install -e ..
-pip install -r populate_tox/requirements.txt
-pip install -r split_tox_gh_actions/requirements.txt
+toxgen.venv/bin/pip install -e ..
+toxgen.venv/bin/pip install -r populate_tox/requirements.txt
+toxgen.venv/bin/pip install -r split_tox_gh_actions/requirements.txt
 
-python populate_tox/populate_tox.py
-python split_tox_gh_actions/split_tox_gh_actions.py
+toxgen.venv/bin/python populate_tox/populate_tox.py
+toxgen.venv/bin/python split_tox_gh_actions/split_tox_gh_actions.py

scripts/populate_tox/config.py

@@ -152,6 +152,12 @@
     "loguru": {
         "package": "loguru",
     },
+    "openai_agents": {
+        "package": "openai-agents",
+        "deps": {
+            "*": ["pytest-asyncio"],
+        },
+    },
     "openfeature": {
         "package": "openfeature-sdk",
     },

scripts/populate_tox/populate_tox.py

@@ -10,7 +10,7 @@
 from bisect import bisect_left
 from collections import defaultdict
 from datetime import datetime, timedelta, timezone  # noqa: F401
-from importlib.metadata import metadata
+from importlib.metadata import PackageMetadata, distributions
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from pathlib import Path
@@ -87,6 +87,13 @@
 }
 
 
+def _fetch_sdk_metadata() -> PackageMetadata:
+    (dist,) = distributions(
+        name="sentry-sdk", path=[Path(__file__).parent.parent.parent]
+    )
+    return dist.metadata
+
+
 def fetch_url(url: str) -> Optional[dict]:
     for attempt in range(3):
         pypi_data = requests.get(url)
@@ -592,8 +599,9 @@ def main(fail_on_changes: bool = False) -> None:
         )
 
     global MIN_PYTHON_VERSION, MAX_PYTHON_VERSION
+    meta = _fetch_sdk_metadata()
     sdk_python_versions = _parse_python_versions_from_classifiers(
-        metadata("sentry-sdk").get_all("Classifier")
+        meta.get_all("Classifier")
     )
     MIN_PYTHON_VERSION = sdk_python_versions[0]
     MAX_PYTHON_VERSION = sdk_python_versions[-1]

scripts/populate_tox/tox.jinja

@@ -372,6 +372,7 @@ setenv =
     litestar: TESTPATH=tests/integrations/litestar
     loguru: TESTPATH=tests/integrations/loguru
     openai: TESTPATH=tests/integrations/openai
+    openai_agents: TESTPATH=tests/integrations/openai_agents
     openfeature: TESTPATH=tests/integrations/openfeature
     pure_eval: TESTPATH=tests/integrations/pure_eval
     pymongo: TESTPATH=tests/integrations/pymongo

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -63,6 +63,7 @@
         "cohere",
         "langchain",
         "openai",
+        "openai_agents",
         "huggingface_hub",
     ],
     "Cloud": [

sentry_sdk/ai/monitoring.py

@@ -103,15 +103,19 @@ def record_token_usage(
     ai_pipeline_name = get_ai_pipeline_name()
     if ai_pipeline_name:
         span.set_attribute(SPANDATA.AI_PIPELINE_NAME, ai_pipeline_name)
+
     if prompt_tokens is not None:
-        span.set_attribute(SPANDATA.AI_PROMPT_TOKENS_USED, prompt_tokens)
+        span.set_attribute(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, prompt_tokens)
+
     if completion_tokens is not None:
-        span.set_attribute(SPANDATA.AI_COMPLETION_TOKENS_USED, completion_tokens)
+        span.set_attribute(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, completion_tokens)
+
     if (
         total_tokens is None
         and prompt_tokens is not None
         and completion_tokens is not None
     ):
         total_tokens = prompt_tokens + completion_tokens
+
     if total_tokens is not None:
-        span.set_attribute(SPANDATA.AI_TOTAL_TOKENS_USED, total_tokens)
+        span.set_attribute(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, total_tokens)

sentry_sdk/integrations/__init__.py

@@ -147,6 +147,7 @@ def iter_default_integrations(
     "launchdarkly": (9, 8, 0),
     "loguru": (0, 7, 0),
     "openai": (1, 0, 0),
+    "openai_agents": (0, 0, 19),
     "openfeature": (0, 7, 1),
     "quart": (0, 16, 0),
     "ray": (2, 7, 0),

sentry_sdk/integrations/openai_agents/__init__.py

@@ -0,0 +1,49 @@
+from sentry_sdk.integrations import DidNotEnable, Integration
+
+from .patches import (
+    _create_get_model_wrapper,
+    _create_get_all_tools_wrapper,
+    _create_run_wrapper,
+    _patch_agent_run,
+)
+
+try:
+    import agents
+
+except ImportError:
+    raise DidNotEnable("OpenAI Agents not installed")
+
+
+def _patch_runner() -> None:
+    # Create the root span for one full agent run (including eventual handoffs)
+    # Note agents.run.DEFAULT_AGENT_RUNNER.run_sync is a wrapper around
+    # agents.run.DEFAULT_AGENT_RUNNER.run. It does not need to be wrapped separately.
+    # TODO-anton: Also patch streaming runner: agents.Runner.run_streamed
+    agents.run.DEFAULT_AGENT_RUNNER.run = _create_run_wrapper(
+        agents.run.DEFAULT_AGENT_RUNNER.run
+    )
+
+    # Creating the actual spans for each agent run.
+    _patch_agent_run()
+
+
+def _patch_model() -> None:
+    agents.run.AgentRunner._get_model = classmethod(
+        _create_get_model_wrapper(agents.run.AgentRunner._get_model),
+    )
+
+
+def _patch_tools() -> None:
+    agents.run.AgentRunner._get_all_tools = classmethod(
+        _create_get_all_tools_wrapper(agents.run.AgentRunner._get_all_tools),
+    )
+
+
+class OpenAIAgentsIntegration(Integration):
+    identifier = "openai_agents"
+
+    @staticmethod
+    def setup_once() -> None:
+        _patch_tools()
+        _patch_model()
+        _patch_runner()