Merge branch 'develop' into ab/deno-reader

Author: andreiborza

.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 }}'
+labels: Tests
+---
+
+### Flakiness Type
+
+Other / Unknown
+
+### Name of Job
+
+{{ env.JOB_NAME }}
+
+### Name of Test
+
+_Not available - check the run link for details_
+
+### Link to Test Run
+
+{{ env.RUN_LINK }}
+
+---
+
+_This issue was automatically created._

.github/workflows/build.yml

@@ -1192,7 +1192,85 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-24.04
+    permissions:
+      issues: write
     steps:
+      - name: Check out current commit
+        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
+        uses: actions/checkout@v6
+        with:
+          sparse-checkout: .github
+
+      - name: Create issues for failed jobs
+        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+
+            // Fetch actual job details from the API to get descriptive names
+            const jobs = await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId,
+              per_page: 100
+            });
+
+            const failedJobs = jobs.filter(job => job.conclusion === 'failure');
+
+            if (failedJobs.length === 0) {
+              console.log('No failed jobs found');
+              return;
+            }
+
+            // Read and parse template
+            const template = fs.readFileSync('.github/FLAKY_CI_FAILURE_TEMPLATE.md', 'utf8');
+            const [, frontmatter, bodyTemplate] = template.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
+
+            // Get existing open issues with Tests label
+            const existing = await github.paginate(github.rest.issues.listForRepo, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              labels: 'Tests',
+              per_page: 100
+            });
+
+            for (const job of failedJobs) {
+              const jobName = job.name;
+              const jobUrl = job.html_url;
+
+              // Replace template variables
+              const vars = {
+                'JOB_NAME': jobName,
+                'RUN_LINK': jobUrl
+              };
+
+              let title = frontmatter.match(/title:\s*'(.*)'/)[1];
+              let issueBody = bodyTemplate;
+              for (const [key, value] of Object.entries(vars)) {
+                const pattern = new RegExp(`\\{\\{\\s*env\\.${key}\\s*\\}\\}`, 'g');
+                title = title.replace(pattern, value);
+                issueBody = issueBody.replace(pattern, value);
+              }
+
+              const existingIssue = existing.find(i => i.title === title);
+
+              if (existingIssue) {
+                console.log(`Issue already exists for ${jobName}: #${existingIssue.number}`);
+                continue;
+              }
+
+              const newIssue = await github.rest.issues.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: title,
+                body: issueBody.trim(),
+                labels: ['Tests']
+              });
+              console.log(`Created issue #${newIssue.data.number} for ${jobName}`);
+            }
+
       - name: Check for failures
         if: cancelled() || contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
         run: |

.github/workflows/ci-metadata.yml

@@ -51,8 +51,11 @@ jobs:
         id: get_metadata
         # We need to try a number of different options for finding the head commit, because each kind of trigger event
         # stores it in a different location
+        env:
+          COMMIT_SHA_EXPR:
+            ${{ github.event.pull_request.head.sha || github.event.head_commit.id || inputs.head_commit }}
         run: |
-          COMMIT_SHA=$(git rev-parse --short ${{ github.event.pull_request.head.sha || github.event.head_commit.id || inputs.head_commit }})
+          COMMIT_SHA=$(git rev-parse --short "$COMMIT_SHA_EXPR")
           echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_ENV
           echo "COMMIT_MESSAGE=$(git log -n 1 --pretty=format:%s $COMMIT_SHA)" >> $GITHUB_ENV
 

.size-limit.js

@@ -276,7 +276,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
     gzip: false,
     brotli: false,
-    limit: '250 KB',
+    limit: '251 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed',

dev-packages/browser-integration-tests/package.json

@@ -62,7 +62,7 @@
     "@sentry-internal/rrweb": "2.34.0",
     "@sentry/browser": "10.48.0",
     "@supabase/supabase-js": "2.49.3",
-    "axios": "1.13.5",
+    "axios": "1.15.0",
     "babel-loader": "^10.1.1",
     "fflate": "0.8.2",
     "html-webpack-plugin": "^5.5.0",

dev-packages/cloudflare-integration-tests/package.json

@@ -16,7 +16,7 @@
     "@langchain/langgraph": "^1.0.1",
     "@sentry/cloudflare": "10.48.0",
     "@sentry/hono": "10.48.0",
-    "hono": "^4.12.7"
+    "hono": "^4.12.12"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",

dev-packages/cloudflare-integration-tests/runner.ts

@@ -68,12 +68,17 @@ export function createRunner(...paths: string[]) {
   // By default, we ignore session & sessions
   const ignored: Set<EnvelopeItemType> = new Set(['session', 'sessions', 'client_report']);
   let serverUrl: string | undefined;
+  const extraWranglerArgs: string[] = [];
 
   return {
     withServerUrl: function (url: string) {
       serverUrl = url;
       return this;
     },
+    withWranglerArgs: function (...args: string[]) {
+      extraWranglerArgs.push(...args);
+      return this;
+    },
     expect: function (expected: Expected) {
       expectedEnvelopes.push(expected);
       return this;
@@ -237,6 +242,7 @@ export function createRunner(...paths: string[]) {
               `SENTRY_DSN:http://public@localhost:${mockServerPort}/1337`,
               '--var',
               `SERVER_URL:${serverUrl}`,
+              ...extraWranglerArgs,
             ],
             { stdio, signal },
           );

dev-packages/cloudflare-integration-tests/suites/tracing/instrument-fetcher/index.ts

@@ -0,0 +1,94 @@
+import { instrumentDurableObjectWithSentry, withSentry } from '@sentry/cloudflare';
+import { DurableObject } from 'cloudflare:workers';
+
+interface Env {
+  SENTRY_DSN: string;
+  ECHO_HEADERS_DO: DurableObjectNamespace;
+}
+
+class EchoHeadersDurableObjectBase extends DurableObject<Env> {
+  async fetch(incoming: Request): Promise<Response> {
+    return Response.json({
+      sentryTrace: incoming.headers.get('sentry-trace'),
+      baggage: incoming.headers.get('baggage'),
+      authorization: incoming.headers.get('authorization'),
+      xFromInit: incoming.headers.get('x-from-init'),
+      xExtra: incoming.headers.get('x-extra'),
+      xMergeProbe: incoming.headers.get('x-merge-probe'),
+    });
+  }
+}
+
+export const EchoHeadersDurableObject = instrumentDurableObjectWithSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  }),
+  EchoHeadersDurableObjectBase,
+);
+
+export default withSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  }),
+  {
+    async fetch(request, env) {
+      const url = new URL(request.url);
+      const id = env.ECHO_HEADERS_DO.idFromName('instrument-fetcher-echo');
+      const stub = env.ECHO_HEADERS_DO.get(id);
+      const doUrl = new URL(request.url);
+
+      let subResponse: Response;
+
+      if (url.pathname === '/via-init') {
+        subResponse = await stub.fetch(doUrl, {
+          headers: {
+            Authorization: 'Bearer from-init',
+            'X-Extra': 'init-extra',
+            'X-Merge-Probe': 'via-init-probe',
+          },
+        });
+      } else if (url.pathname === '/via-request') {
+        subResponse = await stub.fetch(
+          new Request(doUrl, {
+            headers: {
+              Authorization: 'Bearer from-request',
+              'X-Extra': 'request-extra',
+              'X-Merge-Probe': 'via-request-probe',
+            },
+          }),
+        );
+      } else if (url.pathname === '/via-request-and-init') {
+        subResponse = await stub.fetch(
+          new Request(doUrl, {
+            headers: {
+              Authorization: 'Bearer from-request',
+              'X-Extra': 'request-extra',
+              'X-Merge-Probe': 'dropped-from-request',
+            },
+          }),
+          {
+            headers: {
+              'X-From-Init': '1',
+              'X-Merge-Probe': 'via-init-wins',
+            },
+          },
+        );
+      } else if (url.pathname === '/with-preset-sentry-baggage') {
+        subResponse = await stub.fetch(
+          new Request(doUrl, {
+            headers: {
+              baggage: 'sentry-environment=preset,acme=vendor',
+            },
+          }),
+        );
+      } else {
+        return new Response('not found', { status: 404 });
+      }
+
+      const payload: unknown = await subResponse.json();
+      return Response.json(payload);
+    },
+  } satisfies ExportedHandler<Env>,
+);