Merge branch 'develop' into fixing-outcome-flushing-replay

Author: harshit078

.github/workflows/build.yml

@@ -568,9 +568,11 @@ jobs:
           - bundle_min
           - bundle_replay
           - bundle_tracing
+          - bundle_tracing_logs_metrics
           - bundle_tracing_replay
           - bundle_tracing_replay_feedback
           - bundle_tracing_replay_feedback_min
+          - bundle_tracing_replay_feedback_logs_metrics
         project:
           - chromium
         include:

.github/workflows/external-contributors.yml

@@ -35,12 +35,17 @@ jobs:
           name: ${{ github.event.pull_request.user.login }}
           author_association: ${{ github.event.pull_request.author_association }}
 
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.GITFLOW_APP_ID }}
+          private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}
+
       - name: Create PR with changes
         uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
         with:
-          # This token is scoped to Daniel Griesser
-          # If we used the default GITHUB_TOKEN, the resulting PR would not trigger CI :(
-          token: ${{ secrets.REPO_SCOPED_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
           commit-message: 'chore: Add external contributor to CHANGELOG.md'
           title: 'chore: Add external contributor to CHANGELOG.md'
           branch: 'external-contributor/patch-${{ github.event.pull_request.user.login }}'

.github/workflows/gitflow-sync-develop.yml

@@ -25,6 +25,13 @@ jobs:
       - name: git checkout
         uses: actions/checkout@v6
 
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.GITFLOW_APP_ID }}
+          private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}
+
       # https://github.com/marketplace/actions/github-pull-request-action
       - name: Create Pull Request
         id: open-pr
@@ -35,8 +42,7 @@ jobs:
           pr_title: '[Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
           pr_body: 'Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
           pr_label: 'Dev: Gitflow'
-          # This token is scoped to Daniel Griesser
-          github_token: ${{ secrets.REPO_SCOPED_TOKEN }}
+          github_token: ${{ steps.app-token.outputs.token }}
 
       - name: Enable automerge for PR
         if: steps.open-pr.outputs.pr_number != ''

.size-limit.js

@@ -186,6 +186,12 @@ module.exports = [
     gzip: true,
     limit: '43 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Logs, Metrics)',
+    path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
+    gzip: true,
+    limit: '44 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Replay)',
     path: createCDNPath('bundle.tracing.replay.min.js'),
@@ -198,6 +204,12 @@ module.exports = [
     gzip: true,
     limit: '86 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)',
+    path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
+    gzip: true,
+    limit: '86 KB',
+  },
   // browser CDN bundles (non-gzipped)
   {
     name: 'CDN Bundle - uncompressed',
@@ -213,6 +225,13 @@ module.exports = [
     brotli: false,
     limit: '127 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed',
+    path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
+    gzip: false,
+    brotli: false,
+    limit: '130 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
     path: createCDNPath('bundle.tracing.replay.min.js'),
@@ -227,6 +246,13 @@ module.exports = [
     brotli: false,
     limit: '264 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed',
+    path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
+    gzip: false,
+    brotli: false,
+    limit: '264 KB',
+  },
   // Next.js SDK (ESM)
   {
     name: '@sentry/nextjs (client)',

CHANGELOG.md

@@ -4,7 +4,43 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-- **feat(tanstackstart-react): Add `wrapMiddlewaresWithSentry` for manual middleware instrumentation**
+- **feat(tanstackstart-react): Add `sentryTanstackStart` Vite plugin for source maps upload**
+
+  You can now configure source maps upload for TanStack Start using the `sentryTanstackStart` Vite plugin:
+
+  ```ts
+  // vite.config.ts
+  import { defineConfig } from 'vite';
+  import { sentryTanstackStart } from '@sentry/tanstackstart-react';
+  import { tanstackStart } from '@tanstack/react-start/plugin/vite';
+
+  export default defineConfig({
+    plugins: [
+      sentryTanstackStart({
+        authToken: process.env.SENTRY_AUTH_TOKEN,
+        org: 'your-org',
+        project: 'your-project',
+      }),
+      tanstackStart(),
+    ],
+  });
+  ```
+
+Work in this release was contributed by @rreckonerr. Thank you for your contribution!
+
+## 10.34.0
+
+### Important Changes
+
+- **feat(core): Add option to enhance the fetch error message ([#18466](https://github.com/getsentry/sentry-javascript/pull/18466))**
+
+  You can now enable enhanced fetch error messages by setting the `enhancedFetchErrorMessage` option. When enabled, the SDK will include additional context in fetch error messages to help with debugging.
+
+- **feat(nextjs): Add routeManifestInjection option to exclude routes from client bundle ([#18798](https://github.com/getsentry/sentry-javascript/pull/18798))**
+
+  A new `routeManifestInjection` option allows you to exclude sensitive routes from being injected into the client bundle.
+
+- **feat(tanstackstart-react): Add `wrapMiddlewaresWithSentry` for manual middleware instrumentation ([#18680](https://github.com/getsentry/sentry-javascript/pull/18680))**
 
   You can now wrap your middlewares using `wrapMiddlewaresWithSentry`, allowing you to trace middleware execution in your TanStack Start application.
 
@@ -20,6 +56,23 @@
   export const [wrappedLoggingMiddleware] = wrapMiddlewaresWithSentry({ loggingMiddleware });
   ```
 
+### Other Changes
+
+- feat(browser): Add CDN bundle for `tracing.logs.metrics` ([#18784](https://github.com/getsentry/sentry-javascript/pull/18784))
+- feat(core,node-core): Consolidate bun and node types with ServerRuntimeOptions ([#18734](https://github.com/getsentry/sentry-javascript/pull/18734))
+- feat(nextjs): Remove tracing from generation function template ([#18733](https://github.com/getsentry/sentry-javascript/pull/18733))
+- fix(core): Don't record outcomes for failed client reports ([#18808](https://github.com/getsentry/sentry-javascript/pull/18808))
+- fix(deno,cloudflare): Prioritize name from params over name from options ([#18800](https://github.com/getsentry/sentry-javascript/pull/18800))
+- fix(web-vitals): Add error handling for invalid object keys in `WeakMap` ([#18809](https://github.com/getsentry/sentry-javascript/pull/18809))
+
+<details>
+  <summary><strong>Internal Changes</strong></summary>
+
+- ref(nextjs): Split `withSentryConfig` ([#18777](https://github.com/getsentry/sentry-javascript/pull/18777))
+- test(e2e): Pin @shopify/remix-oxygen to unblock ci ([#18811](https://github.com/getsentry/sentry-javascript/pull/18811))
+
+</details>
+
 ## 10.33.0
 
 ### Important Changes

dev-packages/browser-integration-tests/README.md

@@ -74,8 +74,9 @@ To filter tests by their title:
 
 You can refer to [Playwright documentation](https://playwright.dev/docs/test-cli) for other CLI options.
 
-You can set env variable `PW_BUNDLE` to set specific build or bundle to test against. Available options: `esm`, `cjs`,
-`bundle`, `bundle_min`
+You can set env variable `PW_BUNDLE` to set specific build or bundle to test against. Available options include: `esm`, `cjs`,
+`bundle`, `bundle_min`, `bundle_tracing`, `bundle_tracing_logs_metrics`, `bundle_replay`, `bundle_tracing_replay_feedback`, and more.
+See `package.json` scripts for the full list of `test:bundle:*` commands.
 
 ### Troubleshooting
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.33.0",
+  "version": "10.34.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -23,8 +23,14 @@
     "test:bundle:replay:min": "PW_BUNDLE=bundle_replay_min yarn test",
     "test:bundle:tracing": "PW_BUNDLE=bundle_tracing yarn test",
     "test:bundle:tracing:min": "PW_BUNDLE=bundle_tracing_min yarn test",
+    "test:bundle:tracing_logs_metrics": "PW_BUNDLE=bundle_tracing_logs_metrics yarn test",
+    "test:bundle:tracing_logs_metrics:min": "PW_BUNDLE=bundle_tracing_logs_metrics_min yarn test",
+    "test:bundle:tracing_logs_metrics:debug_min": "PW_BUNDLE=bundle_tracing_logs_metrics_debug_min yarn test",
     "test:bundle:full": "PW_BUNDLE=bundle_tracing_replay_feedback yarn test",
     "test:bundle:full:min": "PW_BUNDLE=bundle_tracing_replay_feedback_min yarn test",
+    "test:bundle:tracing_replay_feedback_logs_metrics": "PW_BUNDLE=bundle_tracing_replay_feedback_logs_metrics yarn test",
+    "test:bundle:tracing_replay_feedback_logs_metrics:min": "PW_BUNDLE=bundle_tracing_replay_feedback_logs_metrics_min yarn test",
+    "test:bundle:tracing_replay_feedback_logs_metrics:debug_min": "PW_BUNDLE=bundle_tracing_replay_feedback_logs_metrics_debug_min yarn test",
     "test:cjs": "PW_BUNDLE=cjs yarn test",
     "test:esm": "PW_BUNDLE=esm yarn test",
     "test:loader": "npx playwright test  -c playwright.loader.config.ts --project='chromium'",
@@ -43,7 +49,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "10.33.0",
+    "@sentry/browser": "10.34.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",

dev-packages/browser-integration-tests/suites/public-api/logger/consoleLoggingIntegrationShim/init.js

@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+// consoleLoggingIntegration should not actually work, but still not error out
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  integrations: [Sentry.consoleLoggingIntegration()],
+});

dev-packages/browser-integration-tests/suites/public-api/logger/consoleLoggingIntegrationShim/test.ts

@@ -0,0 +1,37 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+
+sentryTest('exports a shim consoleLoggingIntegration for non-logs bundles', async ({ getLocalTestUrl, page }) => {
+  const bundle = process.env.PW_BUNDLE;
+
+  // Only run this for CDN bundles that do NOT include logs
+  // Skip minified bundles because DEBUG_BUILD is false and warnings won't appear
+  if (!bundle?.startsWith('bundle') || bundle.includes('logs') || bundle.includes('min')) {
+    sentryTest.skip();
+  }
+
+  const consoleMessages: string[] = [];
+  page.on('console', msg => consoleMessages.push(msg.text()));
+
+  let requestCount = 0;
+  await page.route(/^https:\/\/dsn\.ingest\.sentry\.io\//, route => {
+    requestCount++;
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({ id: 'test-id' }),
+    });
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+
+  await page.goto(url);
+
+  // Wait a bit to ensure no requests are made
+  await page.waitForTimeout(500);
+
+  expect(requestCount).toBe(0);
+  expect(consoleMessages).toEqual([
+    'You are using consoleLoggingIntegration() even though this bundle does not include logs.',
+  ]);
+});

dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts

@@ -4,12 +4,12 @@ import { sentryTest } from '../../../../utils/fixtures';
 import {
   getFirstSentryEnvelopeRequest,
   properFullEnvelopeRequestParser,
-  testingCdnBundle,
+  shouldSkipLogsTest,
 } from '../../../../utils/helpers';
 
 sentryTest('should capture console object calls', async ({ getLocalTestUrl, page }) => {
-  // Only run this for npm package exports
-  sentryTest.skip(testingCdnBundle());
+  // Only run this for npm package exports and CDN bundles with logs
+  sentryTest.skip(shouldSkipLogsTest());
 
   const url = await getLocalTestUrl({ testDir: __dirname });