Merge branch 'master' into potel-base

sentrivana · sentrivana · commit ebf1b9ff8be8 · 2024-10-15T17:00:44.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -39,7 +39,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -54,7 +54,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -85,7 +85,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.2.0
+      uses: actions/checkout@v4.2.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release a new version"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
         with:
           token: ${{ secrets.GH_RELEASE_PAT }}
           fetch-depth: 0
diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -92,7 +92,7 @@ jobs:
         python-version: ["3.7","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
@@ -32,7 +32,7 @@ jobs:
     name: permissions check
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
         with:
           persist-credentials: false
       - name: Check permissions on PR
@@ -63,7 +63,7 @@ jobs:
         os: [ubuntu-latest]
     needs: check-permissions
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.8","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
         python-version: ["3.7","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.8","3.10","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -106,7 +106,7 @@ jobs:
         python-version: ["3.7","3.8","3.9","3.10","3.11","3.12"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
@@ -48,7 +48,7 @@ jobs:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -133,7 +133,7 @@ jobs:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.8","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
         python-version: ["3.7","3.8","3.11","3.12"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.8","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -92,7 +92,7 @@ jobs:
         python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.8","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
         python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -48,7 +48,7 @@ jobs:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -124,7 +124,7 @@ jobs:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -30,7 +30,7 @@ jobs:
         python-version: ["3.7","3.8","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
@@ -112,7 +112,7 @@ jobs:
         python-version: ["3.7","3.8","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
diff --git a/docs/conf.py b/docs/conf.py
@@ -8,7 +8,10 @@
 import sphinx.builders.latex
 import sphinx.builders.texinfo
 import sphinx.builders.text
+import sphinx.domains.c  # noqa: F401
+import sphinx.domains.cpp  # noqa: F401
 import sphinx.ext.autodoc  # noqa: F401
+import sphinx.ext.intersphinx  # noqa: F401
 import urllib3.exceptions  # noqa: F401
 
 typing.TYPE_CHECKING = True
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -1,5 +1,5 @@
 gevent
 shibuya
-sphinx==7.2.6
+sphinx
 sphinx-autodoc-typehints[type_comments]>=1.8.0
 typing-extensions
diff --git a/requirements-linting.txt b/requirements-linting.txt
@@ -14,3 +14,4 @@ loguru # There is no separate types module.
 flake8-bugbear
 pep8-naming
 pre-commit # local linting
+httpcore
diff --git a/scripts/split-tox-gh-actions/templates/check_permissions.jinja b/scripts/split-tox-gh-actions/templates/check_permissions.jinja
@@ -2,7 +2,7 @@
     name: permissions check
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
         with:
           persist-credentials: false
 
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -35,7 +35,7 @@
     {% endif %}
 
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.1
       {% if needs_github_secrets %}
       {% raw %}
         with:
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
@@ -14,6 +14,7 @@
     from typing import Optional
     from typing import Set
     from typing import Type
+    from typing import Union
 
 
 _DEFAULT_FAILED_REQUEST_STATUS_CODES = frozenset(range(500, 600))
@@ -125,7 +126,7 @@ def setup_integrations(
     with_auto_enabling_integrations=False,
     disabled_integrations=None,
 ):
-    # type: (Sequence[Integration], bool, bool, Optional[Sequence[Integration]]) -> Dict[str, Integration]
+    # type: (Sequence[Integration], bool, bool, Optional[Sequence[Union[type[Integration], Integration]]]) -> Dict[str, Integration]
     """
     Given a list of integration instances, this installs them all.
 
diff --git a/sentry_sdk/integrations/anthropic.py b/sentry_sdk/integrations/anthropic.py
@@ -1,4 +1,5 @@
 from functools import wraps
+from typing import TYPE_CHECKING
 
 import sentry_sdk
 from sentry_sdk.ai.monitoring import record_token_usage
@@ -11,8 +12,6 @@
     package_version,
 )
 
-from typing import TYPE_CHECKING
-
 try:
     from anthropic.resources import Messages
 
@@ -74,6 +73,21 @@ def _calculate_token_usage(result, span):
     record_token_usage(span, input_tokens, output_tokens, total_tokens)
 
 
+def _get_responses(content):
+    # type: (list[Any]) -> list[dict[str, Any]]
+    """Get JSON of a Anthropic responses."""
+    responses = []
+    for item in content:
+        if hasattr(item, "text"):
+            responses.append(
+                {
+                    "type": item.type,
+                    "text": item.text,
+                }
+            )
+    return responses
+
+
 def _wrap_message_create(f):
     # type: (Any) -> Any
     @wraps(f)
@@ -113,18 +127,7 @@ def _sentry_patched_create(*args, **kwargs):
                 span.set_data(SPANDATA.AI_INPUT_MESSAGES, messages)
             if hasattr(result, "content"):
                 if should_send_default_pii() and integration.include_prompts:
-                    span.set_data(
-                        SPANDATA.AI_RESPONSES,
-                        list(
-                            map(
-                                lambda message: {
-                                    "type": message.type,
-                                    "text": message.text,
-                                },
-                                result.content,
-                            )
-                        ),
-                    )
+                    span.set_data(SPANDATA.AI_RESPONSES, _get_responses(result.content))
                 _calculate_token_usage(result, span)
                 span.__exit__(None, None, None)
             elif hasattr(result, "_iterator"):
@@ -145,7 +148,8 @@ def new_iterator():
                                 elif event.type == "content_block_start":
                                     pass
                                 elif event.type == "content_block_delta":
-                                    content_blocks.append(event.delta.text)
+                                    if hasattr(event.delta, "text"):
+                                        content_blocks.append(event.delta.text)
                                 elif event.type == "content_block_stop":
                                     pass
                                 elif event.type == "message_delta":
diff --git a/sentry_sdk/integrations/langchain.py b/sentry_sdk/integrations/langchain.py
@@ -138,7 +138,7 @@ def _create_span(self, run_id, parent_id, **kwargs):
 
         watched_span = None  # type: Optional[WatchedSpan]
         if parent_id:
-            parent_span = self.span_map[parent_id]  # type: Optional[WatchedSpan]
+            parent_span = self.span_map.get(parent_id)  # type: Optional[WatchedSpan]
             if parent_span:
                 watched_span = WatchedSpan(parent_span.span.start_child(**kwargs))
                 parent_span.children.append(watched_span)
diff --git a/tests/integrations/anthropic/test_anthropic.py b/tests/integrations/anthropic/test_anthropic.py
diff --git a/tox.ini b/tox.ini

-Original file line number
+Diff line change
     steps:
     - name: Checkout repository
 -      uses: actions/[email protected].0
 +      uses: actions/[email protected].1
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL