Merge branch 'develop' into fix/flush-buffers-without-transport

Author: s1gr1d

.agents/skills/e2e/SKILL.md

@@ -116,7 +116,7 @@ All tests completed successfully. Your SDK changes work correctly with this test
 
 - **No tarballs found**: Run `yarn build && yarn build:tarball` at repository root
 - **Test app not found**: List available apps and ask user to clarify
-- **Verdaccio not running**: Tests should start Verdaccio automatically, but if issues occur, check Docker
+- **Packed tarballs missing**: Run `yarn build:tarball` at the repo root, then `yarn test:prepare` in `dev-packages/e2e-tests`
 - **Build failures**: Fix build errors before running tests
 
 ## Common Test Applications

.cursor/BUGBOT.md

@@ -58,6 +58,11 @@ Do not flag the issues below if they appear in tests.
 - Flag usage of `expect.objectContaining` and other relaxed assertions, when a test expects something NOT to be included in a payload but there's no respective assertion.
 - Flag usage of conditionals in one test and recommend splitting up the test for the different paths.
 - Flag usage of loops testing multiple scenarios in one test and recommend using `(it)|(test).each` instead.
+- Flag tests that are likely to introduce flakes. In our case this usually means we wait for some telemetry requests sent from an SDK. Patterns to look out for:
+  - Only waiting for a request, after an action is performed. Instead, start waiting, perform action, await request promise.
+  - Race conditions when waiting on multiple requests. Ensure that waiting checks are unique enough and don't depend on a hard order when there's a chance that telemetry can be sent in arbitrary order.
+  - Timeouts or sleeps in tests. Instead suggest concrete events or other signals to wait on.
+- Flag usage of `getFirstEnvelope*`, `getMultipleEnvelope*` or related test helpers. These are NOT reliable anymore. Instead suggest helpers like `waitForTransaction`, `waitForError`, `waitForSpans`, etc.
 
 ## Platform-safe code
 

.github/FLAKY_CI_FAILURE_TEMPLATE.md

@@ -0,0 +1,24 @@
+---
+title: '[Flaky CI]: {{ env.JOB_NAME }} - {{ env.TEST_NAME }}'
+labels: Tests
+---
+
+### Flakiness Type
+
+Other / Unknown
+
+### Name of Job
+
+{{ env.JOB_NAME }}
+
+### Name of Test
+
+{{ env.TEST_NAME }}
+
+### Link to Test Run
+
+{{ env.RUN_LINK }}
+
+---
+
+_This issue was automatically created._

.github/actions/install-dependencies/action.yml

@@ -15,7 +15,7 @@ runs:
       shell: bash
 
     - name: Check dependency cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       id: cache_dependencies
       with:
         path: ${{ env.CACHED_DEPENDENCY_PATHS }}

.github/actions/install-playwright/action.yml

@@ -18,7 +18,7 @@ runs:
       working-directory: ${{ inputs.cwd }}
 
     - name: Restore cached playwright binaries
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       id: playwright-cache
       with:
         path: |
@@ -43,7 +43,7 @@ runs:
 
     # Only store cache on develop branch
     - name: Store cached playwright binaries
-      uses: actions/cache/save@v4
+      uses: actions/cache/save@v5
       if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
       with:
         path: |

.github/actions/restore-cache/action.yml

@@ -11,13 +11,13 @@ runs:
   steps:
     - name: Check dependency cache
       id: dep-cache
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: ${{ env.CACHED_DEPENDENCY_PATHS }}
         key: ${{ inputs.dependency_cache_key }}
 
     - name: Restore build artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v7
       with:
         name: build-output
 

.github/workflows/build.yml

@@ -152,15 +152,15 @@ jobs:
       changed_node:
         ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
         '@sentry/node') }}
-      changed_node_overhead_action:
-        ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
-        '@sentry-internal/node-overhead-gh-action') }}
       changed_deno:
         ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
         '@sentry/deno') }}
       changed_bun:
         ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
         '@sentry/bun') }}
+      changed_bun_integration:
+        ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
+        '@sentry-internal/bun-integration-tests') }}
       changed_browser_integration:
         ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
         '@sentry-internal/browser-integration-tests') }}
@@ -208,37 +208,6 @@ jobs:
           # Only run comparison against develop if this is a PR
           comparison_branch: ${{ (github.event_name == 'pull_request' && github.base_ref) ||  ''}}
 
-  job_node_overhead_check:
-    name: Node Overhead Check
-    needs: [job_get_metadata, job_build]
-    timeout-minutes: 15
-    runs-on: ubuntu-24.04
-    if:
-      (needs.job_build.outputs.changed_node == 'true' && github.event_name == 'pull_request') ||
-      (needs.job_build.outputs.changed_node_overhead_action == 'true' && github.event_name == 'pull_request') ||
-      needs.job_get_metadata.outputs.is_base_branch == 'true' || needs.job_get_metadata.outputs.is_release == 'true'
-    steps:
-      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: 'package.json'
-      - name: Restore caches
-        uses: ./.github/actions/restore-cache
-        with:
-          dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check node overhead
-        uses: ./dev-packages/node-overhead-gh-action
-        env:
-          DEBUG: '1'
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          # Only run comparison against develop if this is a PR
-          comparison_branch: ${{ (github.event_name == 'pull_request' && github.base_ref) ||  ''}}
-
   job_lint:
     name: Lint
     # Even though the linter only checks source code, not built code, it needs the built code in order check that all
@@ -605,6 +574,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           directory: dev-packages/browser-integration-tests
+          enable-coverage: false
           name:
             browser-playwright-${{ matrix.bundle }}-${{ matrix.project }}${{ matrix.shard && format('-{0}',
             matrix.shard) || '' }}
@@ -669,6 +639,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           directory: dev-packages/browser-integration-tests
+          enable-coverage: false
           name: browser-loader-${{ matrix.bundle }}
 
   job_check_for_faulty_dts:
@@ -737,15 +708,6 @@ jobs:
         working-directory: dev-packages/node-integration-tests
         run: yarn test
 
-      - name: Parse and Upload Coverage
-        if: cancelled() == false
-        continue-on-error: true
-        uses: getsentry/codecov-action@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          directory: dev-packages/node-integration-tests
-          name: node-integration-${{ matrix.node }}${{ matrix.typescript && format('-ts{0}', matrix.typescript) || '' }}
-
   job_node_core_integration_tests:
     name:
       Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Node-Core
@@ -787,16 +749,6 @@ jobs:
         working-directory: dev-packages/node-core-integration-tests
         run: yarn test
 
-      - name: Parse and Upload Coverage
-        if: cancelled() == false
-        continue-on-error: true
-        uses: getsentry/codecov-action@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          directory: dev-packages/node-core-integration-tests
-          name:
-            node-core-integration-${{ matrix.node }}${{ matrix.typescript && format('-ts{0}', matrix.typescript) || ''}}
-
   job_cloudflare_integration_tests:
     name: Cloudflare Integration Tests
     needs: [job_get_metadata, job_build]
@@ -820,6 +772,32 @@ jobs:
         working-directory: dev-packages/cloudflare-integration-tests
         run: yarn test
 
+  job_bun_integration_tests:
+    name: Bun Integration Tests
+    needs: [job_get_metadata, job_build]
+    if: needs.job_build.outputs.changed_bun_integration == 'true' || github.event_name != 'pull_request'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    steps:
+      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: 'package.json'
+      - name: Set up Bun
+        uses: oven-sh/setup-bun@v2
+      - name: Restore caches
+        uses: ./.github/actions/restore-cache
+        with:
+          dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
+
+      - name: Run integration tests
+        working-directory: dev-packages/bun-integration-tests
+        run: yarn test
+
   job_remix_integration_tests:
     name: Remix (Node ${{ matrix.node }}) Tests
     needs: [job_get_metadata, job_build]
@@ -856,15 +834,6 @@ jobs:
           cd packages/remix
           yarn test:integration:ci
 
-      - name: Parse and Upload Coverage
-        if: cancelled() == false
-        continue-on-error: true
-        uses: getsentry/codecov-action@main
-        with:
-          directory: packages/remix
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ matrix.node }}
-
   job_e2e_prepare:
     name: Prepare E2E tests
     # We want to run this if:
@@ -961,7 +930,9 @@ jobs:
         with:
           node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
       - name: Set up Bun
-        if: contains(fromJSON('["node-exports-test-app","nextjs-16-bun", "elysia-bun"]'), matrix.test-application)
+        if:
+          contains(fromJSON('["node-exports-test-app","nextjs-16-bun", "elysia-bun", "hono-4"]'),
+          matrix.test-application)
         uses: oven-sh/setup-bun@v2
       - name: Set up AWS SAM
         if: matrix.test-application == 'aws-serverless'
@@ -970,7 +941,7 @@ jobs:
           use-installer: true
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Deno
-        if: matrix.test-application == 'deno'
+        if: matrix.test-application == 'deno' || matrix.test-application == 'deno-streamed'
         uses: denoland/setup-deno@v2.0.3
         with:
           deno-version: v2.1.5
@@ -990,25 +961,24 @@ jobs:
         if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
         run: yarn build:tarball
 
-      - name: Get node version
-        id: versions
-        run: |
-          echo "echo node=$(jq -r '.volta.node' dev-packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
-
-      - name: Validate Verdaccio
-        run: yarn test:validate
+      - name: Prepare e2e tests
+        run: yarn test:prepare
         working-directory: dev-packages/e2e-tests
 
-      - name: Prepare Verdaccio
-        run: yarn test:prepare
+      - name: Validate e2e tests setup
+        run: yarn test:validate
         working-directory: dev-packages/e2e-tests
-        env:
-          E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
 
       - name: Copy to temp
         run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
         working-directory: dev-packages/e2e-tests
 
+      - name: Add pnpm overrides
+        run:
+          yarn ci:pnpm-overrides ${{ runner.temp }}/test-application ${{ github.workspace
+          }}/dev-packages/e2e-tests/packed
+        working-directory: dev-packages/e2e-tests
+
       - name: Build E2E app
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7
@@ -1053,15 +1023,6 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-      - name: Parse and Upload Coverage
-        if: cancelled() == false
-        continue-on-error: true
-        uses: getsentry/codecov-action@main
-        with:
-          directory: dev-packages/e2e-tests
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: e2e-${{ matrix.test-application }}
-
   # - We skip optional tests on release branches
   job_optional_e2e_tests:
     name: E2E ${{ matrix.label || matrix.test-application }} Test (optional)
@@ -1116,25 +1077,24 @@ jobs:
         if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
         run: yarn build:tarball
 
-      - name: Get node version
-        id: versions
-        run: |
-          echo "echo node=$(jq -r '.volta.node' dev-packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
-
-      - name: Validate Verdaccio
-        run: yarn test:validate
+      - name: Prepare E2E tests
+        run: yarn test:prepare
         working-directory: dev-packages/e2e-tests
 
-      - name: Prepare Verdaccio
-        run: yarn test:prepare
+      - name: Validate test setup
+        run: yarn test:validate
         working-directory: dev-packages/e2e-tests
-        env:
-          E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
 
       - name: Copy to temp
         run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
         working-directory: dev-packages/e2e-tests
 
+      - name: Add pnpm overrides
+        run:
+          yarn ci:pnpm-overrides ${{ runner.temp }}/test-application ${{ github.workspace
+          }}/dev-packages/e2e-tests/packed
+        working-directory: dev-packages/e2e-tests
+
       - name: Build E2E app
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7
@@ -1178,6 +1138,7 @@ jobs:
         job_node_integration_tests,
         job_node_core_integration_tests,
         job_cloudflare_integration_tests,
+        job_bun_integration_tests,
         job_browser_playwright_tests,
         job_browser_loader_tests,
         job_remix_integration_tests,
@@ -1192,7 +1153,28 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+      checks: read
     steps:
+      - name: Check out current commit
+        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
+        uses: actions/checkout@v6
+        with:
+          sparse-checkout: |
+            .github
+            scripts
+
+      - name: Create issues for failed jobs
+        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { default: run } = await import(
+              `${process.env.GITHUB_WORKSPACE}/scripts/report-ci-failures.mjs`
+            );
+            await run({ github, context, core });
+
       - name: Check for failures
         if: cancelled() || contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
         run: |