Merge branch 'master' into webb/fastapi-change-integration-order

Author: alexander-alderman-webb

.coveragerc36

@@ -3,12 +3,12 @@
 
 [run]
 branch = true
-omit = 
+omit =
     /tmp/*
     */tests/*
     */.venv/*
 
 
 [report]
-exclude_lines = 
+exclude_lines =
     if TYPE_CHECKING:

.cursor/rules/core-architecture.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Core Architecture

.cursor/rules/integrations-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Integrations Guide
@@ -133,10 +133,10 @@ from sentry_sdk.integrations import Integration
 
 class MyIntegration(Integration):
     identifier = "my_integration"
-    
+
     def __init__(self, param=None):
         self.param = param
-    
+
     @staticmethod
     def setup_once():
         # Install hooks, monkey patches, etc.

.cursor/rules/project-overview.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Sentry Python SDK - Project Overview

.cursor/rules/quick-reference.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Quick Reference
@@ -44,7 +44,7 @@ tox -e py3.12-django-v5.2.3
 
 ### Code Quality
 
-Our `linters` tox environment runs `black` for formatting, `flake8` for linting and `mypy` for type checking.
+Our `linters` tox environment runs `ruff-format` for formatting, `ruff-check` for linting and `mypy` for type checking.
 
 ```bash
 tox -e linters

.cursor/rules/testing-guide.mdc

@@ -1,6 +1,6 @@
 ---
-description: 
-globs: 
+description:
+globs:
 alwaysApply: false
 ---
 # Testing Guide
@@ -65,10 +65,10 @@ def test_flask_integration(sentry_init, capture_events):
     # Test setup
     sentry_init(integrations=[FlaskIntegration()])
     events = capture_events()
-    
+
     # Test execution
     # ... test code ...
-    
+
     # Assertions
     assert len(events) == 1
     assert events[0]["exception"]["values"][0]["type"] == "ValueError"

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Formatting commits to ignore in git blame
+afea4a017bf13f78e82f725ea9d6a56a8e02cb34
+23a340a9dca60eea36de456def70c00952a33556

.github/workflows/ci.yml

@@ -40,6 +40,9 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
       - uses: actions/setup-python@v6
         with:
           python-version: 3.12

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

@@ -22,8 +22,8 @@ env:
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless
 jobs:
-  test-ai-pinned:
-    name: AI (pinned)
+  test-ai:
+    name: AI
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
@@ -50,42 +50,46 @@ jobs:
       - name: Erase coverage
         run: |
           coverage erase
-      - name: Test anthropic pinned
+      - name: Test anthropic
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-anthropic"
-      - name: Test cohere pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-anthropic"
+      - name: Test cohere
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cohere"
-      - name: Test langchain-base pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-cohere"
+      - name: Test langchain-base
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-base"
-      - name: Test langchain-notiktoken pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-base"
+      - name: Test langchain-notiktoken
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-notiktoken"
-      - name: Test openai-base pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-notiktoken"
+      - name: Test litellm
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-base"
-      - name: Test openai-notiktoken pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-litellm"
+      - name: Test openai-base
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-notiktoken"
-      - name: Test langgraph pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-base"
+      - name: Test openai-notiktoken
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langgraph"
-      - name: Test openai_agents pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-notiktoken"
+      - name: Test langgraph
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai_agents"
-      - name: Test huggingface_hub pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-langgraph"
+      - name: Test openai_agents
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-openai_agents"
+      - name: Test huggingface_hub
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub"
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }}
         run: |
@@ -114,13 +118,13 @@ jobs:
           files: .junitxml
           verbose: true
   check_required_tests:
-    name: All pinned AI tests passed
-    needs: test-ai-pinned
+    name: All AI tests passed
+    needs: test-ai
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-22.04
     steps:
       - name: Check for failures
-        if: needs.test-ai-pinned.result != 'success'
+        if: needs.test-ai.result != 'success'
         run: |
           echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

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

@@ -22,8 +22,8 @@ env:
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless
 jobs:
-  test-cloud-pinned:
-    name: Cloud (pinned)
+  test-cloud:
+    name: Cloud
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
@@ -54,26 +54,26 @@ jobs:
       - name: Erase coverage
         run: |
           coverage erase
-      - name: Test aws_lambda pinned
+      - name: Test aws_lambda
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
-      - name: Test boto3 pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda"
+      - name: Test boto3
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-boto3"
-      - name: Test chalice pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-boto3"
+      - name: Test chalice
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-chalice"
-      - name: Test cloud_resource_context pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-chalice"
+      - name: Test cloud_resource_context
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cloud_resource_context"
-      - name: Test gcp pinned
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-cloud_resource_context"
+      - name: Test gcp
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp"
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }}
         run: |
@@ -102,13 +102,13 @@ jobs:
           files: .junitxml
           verbose: true
   check_required_tests:
-    name: All pinned Cloud tests passed
-    needs: test-cloud-pinned
+    name: All Cloud tests passed
+    needs: test-cloud
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-22.04
     steps:
       - name: Check for failures
-        if: needs.test-cloud-pinned.result != 'success'
+        if: needs.test-cloud.result != 'success'
         run: |
           echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1