Merge branch 'develop' into sig/profiling-manual-mode

# Conflicts:
#	packages/browser/src/profiling/UIProfiler.ts

Author: s1gr1d

.size-limit.js

@@ -240,7 +240,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '158 KB',
+    limit: '160 KB',
   },
   {
     name: '@sentry/node - without tracing',

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+- fix(node): Fix Spotlight configuration precedence to match specification (#18195)
 
 ## 10.25.0
 

dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js

@@ -0,0 +1,25 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0.0',
+  environment: 'test',
+  integrations: integrations => {
+    return integrations.filter(integration => integration.name !== 'BrowserSession');
+  },
+  beforeSendMetric: metric => {
+    if (metric.name === 'test.counter') {
+      return {
+        ...metric,
+        attributes: {
+          ...metric.attributes,
+          modified: 'by-beforeSendMetric',
+          original: undefined,
+        },
+      };
+    }
+    return metric;
+  },
+});

dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js

@@ -0,0 +1,14 @@
+// Store captured metrics from the afterCaptureMetric event
+window.capturedMetrics = [];
+
+const client = Sentry.getClient();
+
+client.on('afterCaptureMetric', metric => {
+  window.capturedMetrics.push(metric);
+});
+
+// Capture metrics - these should be processed by beforeSendMetric
+Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test', original: 'value' } });
+Sentry.metrics.gauge('test.gauge', 42, { unit: 'millisecond', attributes: { server: 'test-1' } });
+
+Sentry.flush();

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

@@ -0,0 +1,59 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+
+sentryTest(
+  'should emit afterCaptureMetric event with processed metric from beforeSendMetric',
+  async ({ getLocalTestUrl, page }) => {
+    const bundle = process.env.PW_BUNDLE || '';
+    if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.waitForFunction(() => {
+      return (window as any).capturedMetrics.length >= 2;
+    });
+
+    const capturedMetrics = await page.evaluate(() => {
+      return (window as any).capturedMetrics;
+    });
+
+    expect(capturedMetrics).toHaveLength(2);
+
+    // Verify the counter metric was modified by beforeSendMetric
+    expect(capturedMetrics[0]).toMatchObject({
+      name: 'test.counter',
+      type: 'counter',
+      value: 1,
+      attributes: {
+        endpoint: '/api/test',
+        modified: 'by-beforeSendMetric',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    // Verify the 'original' attribute was removed by beforeSendMetric
+    expect(capturedMetrics[0].attributes.original).toBeUndefined();
+
+    // Verify the gauge metric was not modified (no beforeSendMetric processing)
+    expect(capturedMetrics[1]).toMatchObject({
+      name: 'test.gauge',
+      type: 'gauge',
+      unit: 'millisecond',
+      value: 42,
+      attributes: {
+        server: 'test-1',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    expect(capturedMetrics[0].attributes['sentry.sdk.version']).toBeDefined();
+    expect(capturedMetrics[1].attributes['sentry.sdk.version']).toBeDefined();
+  },
+);

dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/init.js

@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = Sentry.replayIntegration({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  // Try to set to 60s - should be capped at 50s
+  minReplayDuration: 60000,
+});
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  sampleRate: 0,
+  replaysSessionSampleRate: 1.0,
+  replaysOnErrorSampleRate: 0.0,
+
+  integrations: [window.Replay],
+});

dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/template.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Replay - minReplayDuration Limit</title>
+  </head>
+  <body>
+    <div id="content">
+      <p>Testing that minReplayDuration is capped at 50s max</p>
+    </div>
+  </body>
+</html>

dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/test.ts

@@ -0,0 +1,23 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../utils/fixtures';
+import { shouldSkipReplayTest } from '../../../utils/replayHelpers';
+
+sentryTest('caps minReplayDuration to maximum of 50 seconds', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipReplayTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  await page.goto(url);
+
+  const actualMinReplayDuration = await page.evaluate(() => {
+    // @ts-expect-error - Replay is not typed on window
+    const replayIntegration = window.Replay;
+    const replay = replayIntegration._replay;
+    return replay.getOptions().minReplayDuration;
+  });
+
+  // Even though we configured it to 60s (60000ms), it should be capped to 50s
+  expect(actualMinReplayDuration).toBe(50_000);
+});

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

@@ -31,6 +31,7 @@
     "@hono/node-server": "^1.19.4",
     "@langchain/anthropic": "^0.3.10",
     "@langchain/core": "^0.3.28",
+    "@langchain/langgraph": "^0.2.32",
     "@nestjs/common": "^11",
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",

dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts

@@ -204,6 +204,9 @@ describe('Google GenAI integration', () => {
     });
   });
 
+  const EXPECTED_AVAILABLE_TOOLS_JSON =
+    '[{"name":"controlLight","parametersJsonSchema":{"type":"object","properties":{"brightness":{"type":"number"},"colorTemperature":{"type":"string"}},"required":["brightness","colorTemperature"]}}]';
+
   const EXPECTED_TRANSACTION_TOOLS = {
     transaction: 'main',
     spans: expect.arrayContaining([
@@ -215,7 +218,7 @@ describe('Google GenAI integration', () => {
           'sentry.origin': 'auto.ai.google_genai',
           'gen_ai.system': 'google_genai',
           'gen_ai.request.model': 'gemini-2.0-flash-001',
-          'gen_ai.request.available_tools': expect.any(String), // Should include tools
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'gen_ai.request.messages': expect.any(String), // Should include contents
           'gen_ai.response.text': expect.any(String), // Should include response text
           'gen_ai.response.tool_calls': expect.any(String), // Should include tool calls
@@ -236,7 +239,7 @@ describe('Google GenAI integration', () => {
           'sentry.origin': 'auto.ai.google_genai',
           'gen_ai.system': 'google_genai',
           'gen_ai.request.model': 'gemini-2.0-flash-001',
-          'gen_ai.request.available_tools': expect.any(String), // Should include tools
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'gen_ai.request.messages': expect.any(String), // Should include contents
           'gen_ai.response.streaming': true,
           'gen_ai.response.text': expect.any(String), // Should include response text