Merge remote-tracking branch 'origin/master' into fix/grpc-aio-metadata-list

Author: szokeasaurusrex

.coveragerc36

@@ -0,0 +1,14 @@
+# This is the coverage.py config for Python 3.6
+# The config for newer Python versions is in pyproject.toml.
+
+[run]
+branch = true
+omit = 
+    /tmp/*
+    */tests/*
+    */.venv/*
+
+
+[report]
+exclude_lines = 
+    if TYPE_CHECKING:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Support Request
     url: https://sentry.io/support

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,16 +2,6 @@
 
 ---
 
-## General Notes
+Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
 
-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. Some tests (AWS Lambda) additionally require a maintainer to add a special label to run and will fail if the label is not present.
-
-#### For maintainers
-
-Sensitive test suites require maintainer review to ensure that tests do not compromise our secrets. This review must be repeated after any code revisions.
-
-Before running sensitive test suites, please carefully check the PR. Then, apply the `Trigger: tests using secrets` label. The label will be removed after any code changes to enforce our policy requiring maintainers to review all code revisions before running sensitive tests.
+Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -39,7 +39,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -54,7 +54,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -70,19 +70,22 @@ jobs:
           # This will also trigger "make dist" that creates the Python packages
           make aws-lambda-layer
       - name: Upload Python Packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.sha }}
+          name: artifact-build_lambda_layer
           path: |
             dist/*
+          if-no-files-found: 'error'
+          # since this artifact will be merged, compression is not necessary
+          compression-level: '0'
 
   docs:
     name: Build SDK API Doc
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
@@ -91,7 +94,23 @@ jobs:
           make apidocs
           cd docs/_build && zip -r gh-pages ./
 
-      - uses: actions/[email protected]
+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-docs
+          path: |
+            docs/_build/gh-pages.zip
+          if-no-files-found: 'error'
+          # since this artifact will be merged, compression is not necessary
+          compression-level: '0'
+
+  merge:
+    name: Create Release Artifact
+    runs-on: ubuntu-latest
+    needs: [build_lambda_layer, docs]
+    steps:
+      - uses: actions/upload-artifact/merge@v4
         with:
+          # Craft expects release assets from github to be a single artifact named after the sha.
           name: ${{ github.sha }}
-          path: docs/_build/gh-pages.zip
+          pattern: artifact-*
+          delete-merged: true

.github/workflows/codeql-analysis.yml

@@ -17,13 +17,15 @@ on:
       - master
       - sentry-sdk-2.0
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches:
-      - master
-      - sentry-sdk-2.0
   schedule:
     - cron: '18 18 * * 3'
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -46,7 +48,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4.2.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/enforce-license-compliance.yml

@@ -8,10 +8,11 @@ on:
       - release/*
       - sentry-sdk-2.0
   pull_request:
-    branches:
-      - master
-      - main
-      - sentry-sdk-2.0
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
 
 jobs:
   enforce-license-compliance:

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release a new version"
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           token: ${{ secrets.GH_RELEASE_PAT }}
           fetch-depth: 0

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

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test AI
 on:
   push:
@@ -25,21 +27,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.9","3.11","3.12"]
+        python-version: ["3.7","3.9","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
         # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
         os: [ubuntu-20.04]
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
       - name: Setup Test Env
         run: |
-          pip install coverage tox
+          pip install "coverage[toml]" tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -63,45 +65,55 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
+      - name: Generate coverage XML (Python 3.6)
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }}
+        run: |
+          export COVERAGE_RCFILE=.coveragerc36
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
       - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
+          # make sure no plugins alter our coverage reports
+          plugin: noop
+          verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: .junitxml
+          verbose: true
   test-ai-pinned:
     name: AI (pinned)
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.9","3.11","3.12"]
+        python-version: ["3.7","3.9","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
         # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
         os: [ubuntu-20.04]
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
       - name: Setup Test Env
         run: |
-          pip install coverage tox
+          pip install "coverage[toml]" tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -125,25 +137,35 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
+      - name: Generate coverage XML (Python 3.6)
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }}
+        run: |
+          export COVERAGE_RCFILE=.coveragerc36
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
       - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
+          # make sure no plugins alter our coverage reports
+          plugin: noop
+          verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: .junitxml
+          verbose: true
   check_required_tests:
-    name: All AI tests passed
+    name: All pinned AI tests passed
     needs: test-ai-pinned
     # Always run this, even if a dependent job failed
     if: always()

.github/workflows/test-integrations-aws-lambda.yml

@@ -1,3 +1,5 @@
+# Do not edit this file. This file is generated automatically by executing
+# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
 name: Test AWS Lambda
 on:
   push:
@@ -30,7 +32,7 @@ jobs:
     name: permissions check
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           persist-credentials: false
       - name: Check permissions on PR
@@ -65,7 +67,7 @@ jobs:
         os: [ubuntu-20.04]
     needs: check-permissions
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-python@v5
@@ -74,33 +76,43 @@ jobs:
           allow-prereleases: true
       - name: Setup Test Env
         run: |
-          pip install coverage tox
+          pip install "coverage[toml]" tox
       - name: Erase coverage
         run: |
           coverage erase
       - name: Test aws_lambda pinned
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
+      - name: Generate coverage XML (Python 3.6)
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }}
+        run: |
+          export COVERAGE_RCFILE=.coveragerc36
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
       - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
+          # make sure no plugins alter our coverage reports
+          plugin: noop
+          verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: .junitxml
+          verbose: true
   check_required_tests:
-    name: All AWS Lambda tests passed
+    name: All pinned AWS Lambda tests passed
     needs: test-aws_lambda-pinned
     # Always run this, even if a dependent job failed
     if: always()