ci(codecov): fix coverage

* fix junit overwriting
* one upload per workflow instead of per matrix entry

Author: sl0thentr0py

.claude/settings.json

@@ -39,7 +39,8 @@
       "Bash(ruff format:*)",
       "Bash(ruff check:*)",
       "Bash(mypy:*)",
-      "Bash(uv run *)"
+      "Bash(uv run *)",
+      "Bash(./scripts/generate-test-files.sh)"
     ],
     "deny": []
   }

.coveragerc36

@@ -3,12 +3,20 @@
 
 [run]
 branch = true
+# Match pyproject.toml so the 3.6 container's data file combines with the rest.
+relative_files = true
 omit =
     /tmp/*
     */tests/*
     */.venv/*
 
 
+[paths]
+source =
+    sentry_sdk/
+    */sentry_sdk/
+
+
 [report]
 exclude_lines =
     if TYPE_CHECKING:

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

@@ -40,6 +40,7 @@ jobs:
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
+          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
@@ -48,9 +49,6 @@ jobs:
       - name: Setup Test Env
         run: |
           uv sync
-      - name: Erase coverage
-        run: |
-          uv run coverage erase
       - name: Test openai_agents
         run: |
           set -x # print commands that are executed
@@ -59,18 +57,45 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-pydantic_ai"
-      - name: Generate coverage XML
+      - name: Upload coverage data
         if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: coverage-agents-${{ matrix.python-version }}
+          # .coverage-* / .junitxml-* are dotfiles, excluded by default
+          include-hidden-files: true
+          path: |
+            .coverage-sentry-*
+            .junitxml-*
+          if-no-files-found: 'ignore'
+          retention-days: 1
+  upload-coverage-agents:
+    name: Upload Agents coverage
+    needs: test-agents
+    # Run even if some test jobs failed, to report partial coverage
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - name: Download coverage data
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          pattern: coverage-agents-*
+          merge-multiple: true
+      - name: Combine coverage and generate XML
         run: |
+          uv sync
           uv run coverage combine .coverage-sentry-*
           uv run coverage xml
       - name: Parse and Upload Coverage
-        if: ${{ !cancelled() }}
         uses: getsentry/codecov-action@d90e69cdf071dfbb0430159125321dc09c424d4c # main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: coverage.xml
-          junit-xml-pattern: .junitxml
+          flags: agents
+          junit-xml-pattern: .junitxml-*
           base-branch: master
           verbose: true
   check_required_tests:

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

@@ -40,6 +40,7 @@ jobs:
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
+          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
@@ -48,9 +49,6 @@ jobs:
       - name: Setup Test Env
         run: |
           uv sync
-      - name: Erase coverage
-        run: |
-          uv run coverage erase
       - name: Test langchain-base
         run: |
           set -x # print commands that are executed
@@ -63,18 +61,45 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-langgraph"
-      - name: Generate coverage XML
+      - name: Upload coverage data
         if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: coverage-ai_workflow-${{ matrix.python-version }}
+          # .coverage-* / .junitxml-* are dotfiles, excluded by default
+          include-hidden-files: true
+          path: |
+            .coverage-sentry-*
+            .junitxml-*
+          if-no-files-found: 'ignore'
+          retention-days: 1
+  upload-coverage-ai_workflow:
+    name: Upload AI Workflow coverage
+    needs: test-ai_workflow
+    # Run even if some test jobs failed, to report partial coverage
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - name: Download coverage data
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          pattern: coverage-ai_workflow-*
+          merge-multiple: true
+      - name: Combine coverage and generate XML
         run: |
+          uv sync
           uv run coverage combine .coverage-sentry-*
           uv run coverage xml
       - name: Parse and Upload Coverage
-        if: ${{ !cancelled() }}
         uses: getsentry/codecov-action@d90e69cdf071dfbb0430159125321dc09c424d4c # main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: coverage.xml
-          junit-xml-pattern: .junitxml
+          flags: ai_workflow
+          junit-xml-pattern: .junitxml-*
           base-branch: master
           verbose: true
   check_required_tests:

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

@@ -40,6 +40,7 @@ jobs:
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
+          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
@@ -48,9 +49,6 @@ jobs:
       - name: Setup Test Env
         run: |
           uv sync
-      - name: Erase coverage
-        run: |
-          uv run coverage erase
       - name: Test anthropic
         run: |
           set -x # print commands that are executed
@@ -79,18 +77,45 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-notiktoken"
-      - name: Generate coverage XML
+      - name: Upload coverage data
         if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: coverage-ai-${{ matrix.python-version }}
+          # .coverage-* / .junitxml-* are dotfiles, excluded by default
+          include-hidden-files: true
+          path: |
+            .coverage-sentry-*
+            .junitxml-*
+          if-no-files-found: 'ignore'
+          retention-days: 1
+  upload-coverage-ai:
+    name: Upload AI coverage
+    needs: test-ai
+    # Run even if some test jobs failed, to report partial coverage
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - name: Download coverage data
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          pattern: coverage-ai-*
+          merge-multiple: true
+      - name: Combine coverage and generate XML
         run: |
+          uv sync
           uv run coverage combine .coverage-sentry-*
           uv run coverage xml
       - name: Parse and Upload Coverage
-        if: ${{ !cancelled() }}
         uses: getsentry/codecov-action@d90e69cdf071dfbb0430159125321dc09c424d4c # main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: coverage.xml
-          junit-xml-pattern: .junitxml
+          flags: ai
+          junit-xml-pattern: .junitxml-*
           base-branch: master
           verbose: true
   check_required_tests:

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

@@ -44,6 +44,7 @@ jobs:
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
+          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
@@ -52,9 +53,6 @@ jobs:
       - name: Setup Test Env
         run: |
           uv sync
-      - name: Erase coverage
-        run: |
-          uv run coverage erase
       - name: Test aws_lambda
         run: |
           set -x # print commands that are executed
@@ -75,18 +73,45 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp"
-      - name: Generate coverage XML
+      - name: Upload coverage data
         if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: coverage-cloud-${{ matrix.python-version }}
+          # .coverage-* / .junitxml-* are dotfiles, excluded by default
+          include-hidden-files: true
+          path: |
+            .coverage-sentry-*
+            .junitxml-*
+          if-no-files-found: 'ignore'
+          retention-days: 1
+  upload-coverage-cloud:
+    name: Upload Cloud coverage
+    needs: test-cloud
+    # Run even if some test jobs failed, to report partial coverage
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - name: Download coverage data
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          pattern: coverage-cloud-*
+          merge-multiple: true
+      - name: Combine coverage and generate XML
         run: |
+          uv sync
           uv run coverage combine .coverage-sentry-*
           uv run coverage xml
       - name: Parse and Upload Coverage
-        if: ${{ !cancelled() }}
         uses: getsentry/codecov-action@d90e69cdf071dfbb0430159125321dc09c424d4c # main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: coverage.xml
-          junit-xml-pattern: .junitxml
+          flags: cloud
+          junit-xml-pattern: .junitxml-*
           base-branch: master
           verbose: true
   check_required_tests:

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

@@ -40,6 +40,7 @@ jobs:
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           cache-suffix: ${{ github.workflow }}-${{ matrix.python-version }}
+          enable-cache: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
       - name: Mark workspace safe for git (3.6/3.7 container)
         # needed to make git rev-parse work in the containers
         # subprocesses (e.g. sentry_sdk.utils.get_git_revision) can run git.
@@ -48,25 +49,49 @@ jobs:
       - name: Setup Test Env
         run: |
           uv sync
-      - name: Erase coverage
-        run: |
-          uv run coverage erase
       - name: Test common
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-common"
-      - name: Generate coverage XML
+      - name: Upload coverage data
         if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: coverage-common-${{ matrix.python-version }}
+          # .coverage-* / .junitxml-* are dotfiles, excluded by default
+          include-hidden-files: true
+          path: |
+            .coverage-sentry-*
+            .junitxml-*
+          if-no-files-found: 'ignore'
+          retention-days: 1
+  upload-coverage-common:
+    name: Upload Common coverage
+    needs: test-common
+    # Run even if some test jobs failed, to report partial coverage
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - name: Download coverage data
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          pattern: coverage-common-*
+          merge-multiple: true
+      - name: Combine coverage and generate XML
         run: |
+          uv sync
           uv run coverage combine .coverage-sentry-*
           uv run coverage xml
       - name: Parse and Upload Coverage
-        if: ${{ !cancelled() }}
         uses: getsentry/codecov-action@d90e69cdf071dfbb0430159125321dc09c424d4c # main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: coverage.xml
-          junit-xml-pattern: .junitxml
+          flags: common
+          junit-xml-pattern: .junitxml-*
           base-branch: master
           verbose: true
   check_required_tests: