Merge branch 'master' into webb/concurrent-integration-scopes-only

Author: alexander-alderman-webb

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,14 @@
-<!-- Describe your PR here -->
+### Description
+<!-- What changed and why? -->
 
----
+#### Issues
+<!--
+* resolves: #1234
+* resolves: LIN-1234
+-->
 
-Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
-
-Running the test suite on your PR might require maintainer approval.
+#### Reminders
+- Please add tests to validate your changes, and lint your code using `tox -e linters`.
+- Add GH Issue ID _&_ Linear ID (if applicable)
+- PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`)
+- For external contributors: [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md), [Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord community](https://discord.gg/Ww9hbqr)

.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/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.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,42 @@ 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 openai-base
         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 }}-openai-base"
+      - name: Test openai-notiktoken
         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-notiktoken"
+      - name: Test langgraph
         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 }}-langgraph"
+      - name: Test openai_agents
         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 }}-openai_agents"
+      - name: Test huggingface_hub
         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 }}-huggingface_hub"
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }}
         run: |
@@ -114,13 +114,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

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

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