Merge branch 'develop' into feat/cloudflare-think-e2e

Author: RulaKhaled

.agents/skills/add-ai-integration/SKILL.md

@@ -58,6 +58,7 @@ What the reference files won't tell you:
 - [ ] Instrumentation in `src/ai/`, integration in `src/integrations/`, registered in `getTracingIntegrations()` (LangChain first)
 - [ ] Exported from `packages/server-utils/src/index.ts`, re-exported from the supported runtime packages
 - [ ] E2E tests in `dev-packages/node-integration-tests/suites/tracing/{provider}/` (and `cloudflare-integration-tests/` if supported)
+- [ ] The new suite passes on the other runtimes that run the Node suites, or is excluded there (see "Other Runtimes" in `dev-packages/node-integration-tests/README.md`)
 - [ ] Ops and attributes from `@sentry/conventions`, op derived via `getGenAiSpanOp()`
 - [ ] Recording gated on `resolveAIRecordingOptions()`; no truncation, no token rollup
 - [ ] JSDoc names the channels subscribed to, the supported SDK versions, and — for Pattern 2 — that it requires the Sentry runtime hook or bundler plugin

.agents/skills/vendor-otel/SKILL.md

@@ -43,7 +43,8 @@ grep "import.*from '" <file> | grep -v "@opentelemetry\|'\./\|@sentry\|'util'\|'
 
 Check test coverage and report gaps:
 
-- Integration tests: `dev-packages/node-integration-tests/suites/tracing/<name>/`
+- Integration tests: `dev-packages/node-integration-tests/suites/tracing/<name>/`. Other runtimes run these
+  suites too; see "Other Runtimes" in `dev-packages/node-integration-tests/README.md`.
 - E2E tests: `dev-packages/e2e-tests/test-applications/node-<name>/`
 - Unit tests: `packages/node/test/integrations/tracing/<name>.test.ts`
 

.agents/skills/write-tests/SKILL.md

@@ -337,6 +337,9 @@ describe('patchRoute', () => {
 Node integration tests (`dev-packages/node-integration-tests/`) use `createEsmAndCjsTests` to
 run a real Node scenario file and assert on captured Sentry envelopes.
 
+Other runtimes run these suites too. A new suite must pass there or be excluded; see "Other
+Runtimes" in `dev-packages/node-integration-tests/README.md`.
+
 ### Minimize `test()` calls — each one spawns a separate Node process
 
 **This is the opposite of the Playwright rule.** In Playwright, each `test()` is cheap — use

.github/CODEOWNERS

@@ -8,10 +8,9 @@
 /dev-packages/browser-integration-tests/ @getsentry/team-javascript-sdks-browser
 
 # Node/server runtimes and related packages
-# TEMP: whole JS SDK team reviews orchestrion work; revert to team-javascript-sdks-server after
-/packages/node/                     @getsentry/team-javascript-sdks
-/packages/server-runtime-injection/ @getsentry/team-javascript-sdks
-/packages/server-utils/             @getsentry/team-javascript-sdks
+/packages/node/                     @getsentry/team-javascript-sdks-server
+/packages/server-runtime-injection/ @getsentry/team-javascript-sdks-server
+/packages/server-utils/             @getsentry/team-javascript-sdks-server
 /packages/node-native/              @getsentry/team-javascript-sdks-server
 /packages/profiling-node/           @getsentry/team-javascript-sdks-server
 /packages/opentelemetry/            @getsentry/team-javascript-sdks-server

.github/FLAKY_CI_FAILURE_TEMPLATE.md

@@ -12,6 +12,7 @@ body:
         - Timeout
         - Assertion failure
         - Other / Unknown
+      default: 1
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/flaky.yml

@@ -783,7 +783,7 @@ jobs:
   job_node_integration_tests:
     name:
       Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Integration
-      Tests
+      Tests (${{ matrix.shard }}/3)
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_node_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
@@ -792,12 +792,20 @@ jobs:
       fail-fast: false
       matrix:
         node: [20.19, 22, 24, 26]
+        shard: [1, 2, 3]
         typescript:
           - false
         include:
           # Only check typescript for latest version (to streamline CI)
           - node: 24
             typescript: '5.0'
+            shard: 1
+          - node: 24
+            typescript: '5.0'
+            shard: 2
+          - node: 24
+            typescript: '5.0'
+            shard: 3
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -832,14 +840,18 @@ jobs:
 
       - name: Run integration tests
         working-directory: dev-packages/node-integration-tests
-        run: yarn test
+        run: yarn test --shard=${{ matrix.shard }}/3
 
   job_cloudflare_integration_tests:
-    name: Cloudflare Integration Tests
+    name: Cloudflare Integration Tests (${{ matrix.shard }}/2)
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_cloudflare_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
     timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -856,7 +868,7 @@ jobs:
 
       - name: Run integration tests
         working-directory: dev-packages/cloudflare-integration-tests
-        run: yarn test
+        run: yarn test --shard=${{ matrix.shard }}/2
 
   job_bundler_plugin_integration_tests:
     name: Bundler Plugin Integration Tests (Node ${{ matrix.node }})
@@ -1261,28 +1273,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-24.04
-    permissions:
-      issues: write
-      checks: read
+    permissions: {}
     steps:
-      - name: Check out current commit
-        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
-        uses: actions/checkout@v7
-        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@v9
-        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: |

.github/workflows/build.yml

@@ -31,6 +31,6 @@ jobs:
 
           if ! output=$(npx --yes wrangler@4 delete --name "$WORKER" --force 2>&1); then
             echo "$output"
-            # 10007 means the worker does not exist, i.e. the PR never ran the optional E2E job.
-            echo "$output" | grep -q 'code: 10007' || exit 1
+            # 10007 and 10090 mean the worker does not exist, e.g. the PR never ran the optional E2E job.
+            echo "$output" | grep -Eq 'code: (10007|10090)\]' || exit 1
           fi

.github/workflows/cleanup-e2e-workers.yml

@@ -0,0 +1,35 @@
+name: 'CI: Weekly flaky tests'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 7 * * 1'
+      timezone: 'Europe/Vienna'
+
+permissions:
+  contents: read
+  actions: read
+  checks: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  report:
+    name: Weekly flaky test report
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - name: Analyze the last seven days of develop CI
+        uses: actions/github-script@v9
+        with:
+          retries: 3
+          script: |
+            const { default: run } = await import(
+              `${process.env.GITHUB_WORKSPACE}/scripts/weekly-flaky-tests.mjs`
+            );
+            await run({ github, context, core });