Merge branch 'develop' into ab/unpin-e2e-rr-spa

Author: chargome

.eslintrc.js

@@ -23,6 +23,9 @@ module.exports = {
     'types/**',
     'scripts/*.js',
   ],
+  rules: {
+    '@typescript-eslint/no-explicit-any': 'error',
+  },
   reportUnusedDisableDirectives: true,
   overrides: [
     {
@@ -36,6 +39,9 @@ module.exports = {
       parserOptions: {
         project: ['tsconfig.test.json'],
       },
+      rules: {
+        '@typescript-eslint/no-explicit-any': 'off',
+      },
     },
     {
       files: ['scripts/**/*.ts'],

.github/workflows/build.yml

@@ -128,7 +128,7 @@ jobs:
       needs.job_get_metadata.outputs.changed_any_code == 'true' ||
       needs.job_get_metadata.outputs.is_base_branch == 'true' ||
       needs.job_get_metadata.outputs.is_release == 'true' ||
-      (needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
+      (needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false' && needs.job_get_metadata.outputs.changed_any_code == 'true')
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
         uses: actions/checkout@v6
@@ -1144,15 +1144,6 @@ jobs:
           retention-days: 7
           if-no-files-found: ignore
 
-      - name: Deploy Astro to Cloudflare
-        uses: cloudflare/wrangler-action@v3
-        if: matrix.test-application == 'cloudflare-astro'
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
-          workingDirectory: ${{ runner.temp }}/test-application
-
   job_required_jobs_passed:
     name: All required jobs passed or were skipped
     needs:

.size-limit.js

@@ -112,6 +112,27 @@ module.exports = [
     gzip: true,
     limit: '35 KB',
   },
+  {
+    name: '@sentry/browser (incl. Metrics)',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
+    import: createImport('init', 'metrics'),
+    gzip: true,
+    limit: '27 KB',
+  },
+  {
+    name: '@sentry/browser (incl. Logs)',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
+    import: createImport('init', 'logger'),
+    gzip: true,
+    limit: '27 KB',
+  },
+  {
+    name: '@sentry/browser (incl. Metrics & Logs)',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
+    import: createImport('init', 'metrics', 'logger'),
+    gzip: true,
+    limit: '28 KB',
+  },
   // React SDK (ESM)
   {
     name: '@sentry/react',
@@ -213,7 +234,7 @@ module.exports = [
     import: createImport('init'),
     ignore: ['next/router', 'next/constants'],
     gzip: true,
-    limit: '46 KB',
+    limit: '46.5 KB',
   },
   // SvelteKit SDK (ESM)
   {

CHANGELOG.md

@@ -4,22 +4,118 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-- **feat(nextjs): Add tree-shaking configuration to `webpack` build config ([#18359](https://github.com/getsentry/sentry-javascript/pull/18359))**
+## 10.32.1
+
+- fix(cloudflare): Add hono transaction name when error is thrown ([#18529](https://github.com/getsentry/sentry-javascript/pull/18529))
+- fix(ember): Make `implementation` field optional (`hash` routes) ([#18564](https://github.com/getsentry/sentry-javascript/pull/18564))
+- fix(vercelai): Fix input token count ([#18574](https://github.com/getsentry/sentry-javascript/pull/18574))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore(lint): prefer 'unknown' to 'any', fix lint warnings
+- chore(test): Remove `cloudflare-astro` e2e test ([#18567](https://github.com/getsentry/sentry-javascript/pull/18567))
+
+</details>
+
+## 10.32.0
+
+### Important Changes
+
+- **feat(core): Apply scope attributes to logs ([#18184](https://github.com/getsentry/sentry-javascript/pull/18184))**
+
+  You can now set attributes on the SDK's scopes which will be applied to all logs as long as the respective scopes are active. For the time being, only `string`, `number` and `boolean` attribute values are supported.
+
+  ```ts
+  Sentry.geGlobalScope().setAttributes({ is_admin: true, auth_provider: 'google' });
+
+  Sentry.withScope(scope => {
+    scope.setAttribute('step', 'authentication');
+
+    // scope attributes `is_admin`, `auth_provider` and `step` are added
+    Sentry.logger.info(`user ${user.id} logged in`, { activeSince: 100 });
+    Sentry.logger.info(`updated ${user.id} last activity`);
+  });
+
+  // scope attributes `is_admin` and `auth_provider` are added
+  Sentry.logger.warn('stale website version, reloading page');
+  ```
 
 - **feat(replay): Add Request body with `attachRawBodyFromRequest` option ([#18501](https://github.com/getsentry/sentry-javascript/pull/18501))**
 
-To attach the raw request body (from `Request` objects passed as the first `fetch` argument) to replay events,
-you can now use the `attachRawBodyFromRequest` option in the Replay integration:
+  To attach the raw request body (from `Request` objects passed as the first `fetch` argument) to replay events, you can now use the `attachRawBodyFromRequest` option in the Replay integration:
 
-```js
-Sentry.init({
-  integrations: [
-    Sentry.replayIntegration({
-      attachRawBodyFromRequest: true,
+  ```js
+  Sentry.init({
+    integrations: [
+      Sentry.replayIntegration({
+        attachRawBodyFromRequest: true,
+      }),
+    ],
+  });
+  ```
+
+- **feat(tanstackstart-react): Trace server functions ([#18500](https://github.com/getsentry/sentry-javascript/pull/18500))**
+
+  To enable tracing for server-side requests, you can now explicitly define a [server entry point](https://tanstack.com/start/latest/docs/framework/react/guide/server-entry-point) in your application and wrap your request handler with `wrapFetchWithSentry`.
+
+  ```typescript
+  // src/server.ts
+  import { wrapFetchWithSentry } from '@sentry/tanstackstart-react';
+  import handler, { createServerEntry } from '@tanstack/react-start/server-entry';
+
+  export default createServerEntry(
+    wrapFetchWithSentry({
+      fetch(request: Request) {
+        return handler.fetch(request);
+      },
     }),
-  ],
-});
-```
+  );
+  ```
+
+- **feat(vue): Add TanStack Router integration ([#18547](https://github.com/getsentry/sentry-javascript/pull/18547))**
+
+  The `@sentry/vue` package now includes support for TanStack Router. Use `tanstackRouterBrowserTracingIntegration` to automatically instrument pageload and navigation transactions with parameterized routes:
+
+  ```javascript
+  import { createApp } from 'vue';
+  import { createRouter } from '@tanstack/vue-router';
+  import * as Sentry from '@sentry/vue';
+  import { tanstackRouterBrowserTracingIntegration } from '@sentry/vue/tanstackrouter';
+
+  const router = createRouter({
+    // your router config
+  });
+
+  Sentry.init({
+    app,
+    dsn: '__PUBLIC_DSN__',
+    integrations: [tanstackRouterBrowserTracingIntegration(router)],
+    tracesSampleRate: 1.0,
+  });
+  ```
+
+### Other Changes
+
+- feat(core): Capture initialize attributes on MCP servers ([#18531](https://github.com/getsentry/sentry-javascript/pull/18531))
+- feat(nextjs): Extract tracing logic from server component wrapper templates ([#18408](https://github.com/getsentry/sentry-javascript/pull/18408))
+- feat(nextjs): added webpack treeshaking flags as config ([#18359](https://github.com/getsentry/sentry-javascript/pull/18359))
+- fix(solid/tanstackrouter): Ensure web vitals are sent on pageload ([#18542](https://github.com/getsentry/sentry-javascript/pull/18542))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore(changelog): Add entry for scope attributes ([#18555](https://github.com/getsentry/sentry-javascript/pull/18555))
+- chore(changelog): Add entry for tanstack start wrapFetchWithSentry ([#18558](https://github.com/getsentry/sentry-javascript/pull/18558))
+- chore(deps): bump @trpc/server from 10.45.2 to 10.45.3 in /dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation ([#18530](https://github.com/getsentry/sentry-javascript/pull/18530))
+- chore(deps): bump @trpc/server from 10.45.2 to 10.45.3 in /dev-packages/e2e-tests/test-applications/node-express-v5 ([#18550](https://github.com/getsentry/sentry-javascript/pull/18550))
+- chore(e2e): Pin to react-router 7.10.1 in spa e2e test ([#18548](https://github.com/getsentry/sentry-javascript/pull/18548))
+- chore(e2e): Remove check on `http.response_content_length_uncompressed` ([#18536](https://github.com/getsentry/sentry-javascript/pull/18536))
+- chore(github): Add "Closes" to PR template ([#18538](https://github.com/getsentry/sentry-javascript/pull/18538))
+- test(cloudflare-mcp): Unpin mcp sdk ([#18528](https://github.com/getsentry/sentry-javascript/pull/18528))
+- test(nextjs): Add e2e tests for server component spans in next 16 ([#18544](https://github.com/getsentry/sentry-javascript/pull/18544))
+
+</details>
 
 ## 10.31.0
 

dev-packages/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['../.eslintrc.js'],
+  rules: {
+    // tests often have just cause to do evil
+    '@typescript-eslint/no-explicit-any': 'off',
+  },
+};

dev-packages/browser-integration-tests/.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
     node: true,
   },
   // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
-  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  extends: ['../.eslintrc.js', 'plugin:regexp/recommended'],
   plugins: ['regexp'],
   ignorePatterns: [
     'suites/**/subject.js',

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.31.0",
+  "version": "10.32.1",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -43,7 +43,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "10.31.0",
+    "@sentry/browser": "10.32.1",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",

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

@@ -1,14 +1,15 @@
 import { expect } from '@playwright/test';
 import type { LogEnvelope } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
+import {
+  getFirstSentryEnvelopeRequest,
+  properFullEnvelopeRequestParser,
+  testingCdnBundle,
+} from '../../../../utils/helpers';
 
 sentryTest('should capture console object calls', async ({ getLocalTestUrl, page }) => {
-  const bundle = process.env.PW_BUNDLE || '';
   // Only run this for npm package exports
-  if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
-    sentryTest.skip();
-  }
+  sentryTest.skip(testingCdnBundle());
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 

dev-packages/browser-integration-tests/suites/public-api/logger/scopeAttributes/subject.js

@@ -0,0 +1,33 @@
+// only log attribute
+Sentry.logger.info('log_before_any_scope', { log_attr: 'log_attr_1' });
+
+Sentry.getGlobalScope().setAttributes({ global_scope_attr: true });
+
+// this attribute will not be sent for now
+Sentry.getGlobalScope().setAttribute('array_attr', [1, 2, 3]);
+
+// global scope, log attribute
+Sentry.logger.info('log_after_global_scope', { log_attr: 'log_attr_2' });
+
+Sentry.withIsolationScope(isolationScope => {
+  isolationScope.setAttribute('isolation_scope_1_attr', { value: 100, unit: 'millisecond' });
+
+  // global scope, isolation scope, log attribute
+  Sentry.logger.info('log_with_isolation_scope', { log_attr: 'log_attr_3' });
+
+  Sentry.withScope(scope => {
+    scope.setAttributes({ scope_attr: { value: 200, unit: 'millisecond' } });
+
+    // global scope, isolation scope, current scope attribute, log attribute
+    Sentry.logger.info('log_with_scope', { log_attr: 'log_attr_4' });
+  });
+
+  Sentry.withScope(scope2 => {
+    scope2.setAttribute('scope_2_attr', { value: 300, unit: 'millisecond' });
+
+    // global scope, isolation scope, current scope attribute, log attribute
+    Sentry.logger.info('log_with_scope_2', { log_attr: 'log_attr_5' });
+  });
+});
+
+Sentry.flush();

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

@@ -0,0 +1,98 @@
+import { expect } from '@playwright/test';
+import type { LogEnvelope } from '@sentry/core';
+import { sentryTest } from '../../../../utils/fixtures';
+import {
+  getFirstSentryEnvelopeRequest,
+  properFullEnvelopeRequestParser,
+  testingCdnBundle,
+} from '../../../../utils/helpers';
+
+sentryTest('captures logs with scope attributes', async ({ getLocalTestUrl, page }) => {
+  sentryTest.skip(testingCdnBundle());
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  const event = await getFirstSentryEnvelopeRequest<LogEnvelope>(page, url, properFullEnvelopeRequestParser);
+  const envelopeItems = event[1];
+
+  expect(envelopeItems[0]).toEqual([
+    {
+      type: 'log',
+      item_count: 5,
+      content_type: 'application/vnd.sentry.items.log+json',
+    },
+    {
+      items: [
+        {
+          timestamp: expect.any(Number),
+          level: 'info',
+          body: 'log_before_any_scope',
+          severity_number: 9,
+          trace_id: expect.any(String),
+          attributes: {
+            'sentry.sdk.name': { value: 'sentry.javascript.browser', type: 'string' },
+            'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+            log_attr: { value: 'log_attr_1', type: 'string' },
+          },
+        },
+        {
+          timestamp: expect.any(Number),
+          level: 'info',
+          body: 'log_after_global_scope',
+          severity_number: 9,
+          trace_id: expect.any(String),
+          attributes: {
+            'sentry.sdk.name': { value: 'sentry.javascript.browser', type: 'string' },
+            'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+            global_scope_attr: { value: true, type: 'boolean' },
+            log_attr: { value: 'log_attr_2', type: 'string' },
+          },
+        },
+        {
+          timestamp: expect.any(Number),
+          level: 'info',
+          body: 'log_with_isolation_scope',
+          severity_number: 9,
+          trace_id: expect.any(String),
+          attributes: {
+            'sentry.sdk.name': { value: 'sentry.javascript.browser', type: 'string' },
+            'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+            global_scope_attr: { value: true, type: 'boolean' },
+            isolation_scope_1_attr: { value: 100, unit: 'millisecond', type: 'integer' },
+            log_attr: { value: 'log_attr_3', type: 'string' },
+          },
+        },
+        {
+          timestamp: expect.any(Number),
+          level: 'info',
+          body: 'log_with_scope',
+          severity_number: 9,
+          trace_id: expect.any(String),
+          attributes: {
+            'sentry.sdk.name': { value: 'sentry.javascript.browser', type: 'string' },
+            'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+            global_scope_attr: { value: true, type: 'boolean' },
+            isolation_scope_1_attr: { value: 100, unit: 'millisecond', type: 'integer' },
+            scope_attr: { value: 200, unit: 'millisecond', type: 'integer' },
+            log_attr: { value: 'log_attr_4', type: 'string' },
+          },
+        },
+        {
+          timestamp: expect.any(Number),
+          level: 'info',
+          body: 'log_with_scope_2',
+          severity_number: 9,
+          trace_id: expect.any(String),
+          attributes: {
+            'sentry.sdk.name': { value: 'sentry.javascript.browser', type: 'string' },
+            'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+            global_scope_attr: { value: true, type: 'boolean' },
+            isolation_scope_1_attr: { value: 100, unit: 'millisecond', type: 'integer' },
+            scope_2_attr: { value: 300, unit: 'millisecond', type: 'integer' },
+            log_attr: { value: 'log_attr_5', type: 'string' },
+          },
+        },
+      ],
+    },
+  ]);
+});