Merge remote-tracking branch 'upstream/develop' into timfish/feat/new-anr

Author: timfish

CHANGELOG.md

@@ -4,6 +4,33 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.32.0
+
+### Important Changes
+
+- feat(browser): Add CLS sources to span attributes ([#16710](https://github.com/getsentry/sentry-javascript/pull/16710))
+
+Enhances CLS (Cumulative Layout Shift) spans by adding attributes detailing the elements that caused layout shifts.
+
+- feat(cloudflare): Add `instrumentWorkflowWithSentry` to instrument workflows ([#16672](https://github.com/getsentry/sentry-javascript/pull/16672))
+
+We've added support for Cloudflare Workflows, enabling comprehensive tracing for your workflow runs. This integration uses the workflow's instanceId as the Sentry trace_id and for sampling, linking all steps together. You'll now be able to see full traces, including retries with exponential backoff.
+
+- feat(pino-transport): Add functionality to send logs to sentry ([#16667](https://github.com/getsentry/sentry-javascript/pull/16667))
+
+Adds the ability to send logs to Sentry via a pino transport.
+
+### Other Changes
+
+- feat(nextjs): Expose top level buildTime `errorHandler` option ([#16718](https://github.com/getsentry/sentry-javascript/pull/16718))
+- feat(node): update pipeline spans to use agent naming ([#16712](https://github.com/getsentry/sentry-javascript/pull/16712))
+- feat(deps): bump @prisma/instrumentation from 6.9.0 to 6.10.1 ([#16698](https://github.com/getsentry/sentry-javascript/pull/16698))
+- fix(sveltekit): Export logger from sveltekit worker ([#16716](https://github.com/getsentry/sentry-javascript/pull/16716))
+- fix(google-cloud-serverless): Make `CloudEventsContext` compatible with `CloudEvent` ([#16705](https://github.com/getsentry/sentry-javascript/pull/16705))
+- fix(nextjs): Stop injecting release value when create release options is set to `false` ([#16695](https://github.com/getsentry/sentry-javascript/pull/16695))
+- fix(node): account for Object. syntax with local variables matching ([#16702](https://github.com/getsentry/sentry-javascript/pull/16702))
+- fix(nuxt): Add alias for `@opentelemetry/resources` ([#16727](https://github.com/getsentry/sentry-javascript/pull/16727))
+
 Work in this release was contributed by @flaeppe. Thank you for your contribution!
 
 ## 9.31.0

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

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

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/init.js

@@ -0,0 +1,19 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+// Force this so that the initial sampleRand is consistent
+Math.random = () => 0.45;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [Sentry.browserTracingIntegration()],
+  tracePropagationTargets: ['http://sentry-test-site.example'],
+  tracesSampler: ({ name }) => {
+    if (name === 'new-trace') {
+      return 0.9;
+    }
+
+    return 0.5;
+  },
+});

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/subject.js

@@ -0,0 +1,13 @@
+const newTraceBtn = document.getElementById('newTrace');
+newTraceBtn.addEventListener('click', async () => {
+  Sentry.startNewTrace(() => {
+    // We want to ensure the new trace is sampled, so we force the sample_rand to a value above 0.9
+    Sentry.getCurrentScope().setPropagationContext({
+      ...Sentry.getCurrentScope().getPropagationContext(),
+      sampleRand: 0.85,
+    });
+    Sentry.startSpan({ op: 'ui.interaction.click', name: 'new-trace' }, async () => {
+      await fetch('http://sentry-test-site.example');
+    });
+  });
+});

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/template.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="newTrace">new Trace</button>
+  </body>
+</html>

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/test.ts

@@ -0,0 +1,89 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+import type { EventAndTraceHeader } from '../../../../utils/helpers';
+import {
+  eventAndTraceHeaderRequestParser,
+  getFirstSentryEnvelopeRequest,
+  shouldSkipTracingTest,
+  waitForTransactionRequest,
+} from '../../../../utils/helpers';
+
+sentryTest(
+  'new trace started with `startNewTrace` is sampled according to the `tracesSampler`',
+  async ({ getLocalTestUrl, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.route('http://sentry-test-site.example/**', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({}),
+      });
+    });
+
+    const [pageloadEvent, pageloadTraceHeaders] = await getFirstSentryEnvelopeRequest<EventAndTraceHeader>(
+      page,
+      url,
+      eventAndTraceHeaderRequestParser,
+    );
+
+    const pageloadTraceContext = pageloadEvent.contexts?.trace;
+
+    expect(pageloadEvent.type).toEqual('transaction');
+
+    expect(pageloadTraceContext).toMatchObject({
+      op: 'pageload',
+      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
+      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      data: {
+        'sentry.sample_rate': 0.5,
+      },
+    });
+    expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
+
+    expect(pageloadTraceHeaders).toEqual({
+      environment: 'production',
+      public_key: 'public',
+      sample_rate: '0.5',
+      sampled: 'true',
+      trace_id: pageloadTraceContext?.trace_id,
+      sample_rand: '0.45',
+    });
+
+    const transactionPromise = waitForTransactionRequest(page, event => {
+      return event.transaction === 'new-trace';
+    });
+
+    await page.locator('#newTrace').click();
+
+    const [newTraceTransactionEvent, newTraceTransactionTraceHeaders] = eventAndTraceHeaderRequestParser(
+      await transactionPromise,
+    );
+
+    const newTraceTransactionTraceContext = newTraceTransactionEvent.contexts?.trace;
+    expect(newTraceTransactionTraceContext).toMatchObject({
+      op: 'ui.interaction.click',
+      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
+      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      data: {
+        'sentry.sample_rate': 0.9,
+      },
+    });
+
+    expect(newTraceTransactionTraceHeaders).toEqual({
+      environment: 'production',
+      public_key: 'public',
+      sample_rate: '0.9',
+      sampled: 'true',
+      trace_id: newTraceTransactionTraceContext?.trace_id,
+      transaction: 'new-trace',
+      sample_rand: '0.85',
+    });
+
+    expect(newTraceTransactionTraceContext?.trace_id).not.toEqual(pageloadTraceContext?.trace_id);
+  },
+);

dev-packages/bundle-analyzer-scenarios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.31.0",
+  "version": "9.32.0",
   "description": "Scenarios to test bundle analysis with",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/clear-cache-gh-action",
   "description": "An internal Github Action to clear GitHub caches.",
-  "version": "9.31.0",
+  "version": "9.32.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "9.31.0",
+  "version": "9.32.0",
   "license": "MIT",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/create-next-app/package.json

@@ -8,15 +8,15 @@
     "test:prod": "TEST_ENV=prod playwright test",
     "test:dev": "TEST_ENV=dev playwright test",
     "test:build": "pnpm install && pnpm build",
-    "test:build-13": "pnpm install && pnpm add next@13.4.19 && pnpm build",
+    "test:build-13": "pnpm install && pnpm add next@13.5.9 && pnpm build",
     "test:assert": "pnpm test:prod && pnpm test:dev"
   },
   "dependencies": {
     "@sentry/nextjs": "latest || *",
     "@types/node": "^18.19.1",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "14.0.0",
+    "next": "14.2.25",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "~5.0.0"

dev-packages/e2e-tests/test-applications/nextjs-13/package.json

@@ -17,7 +17,7 @@
     "@types/node": "^18.19.1",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "13.5.7",
+    "next": "13.5.9",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "~5.0.0"

dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json

@@ -11,7 +11,7 @@
     "test:test-build": "pnpm ts-node --script-mode assert-build.ts",
     "test:build-canary": "pnpm install && pnpm add next@canary && pnpm add react@beta && pnpm add react-dom@beta && pnpm build",
     "test:build-latest": "pnpm install && pnpm add next@latest && pnpm build",
-    "test:build-13": "pnpm install && pnpm add next@13.4.19 && pnpm build",
+    "test:build-13": "pnpm install && pnpm add next@13.5.9 && pnpm build",
     "test:assert": "pnpm test:test-build && pnpm test:prod && pnpm test:dev"
   },
   "dependencies": {

dev-packages/e2e-tests/test-applications/node-fastify-5/src/app.ts

@@ -34,8 +34,6 @@ const app = fastify();
 const port = 3030;
 const port2 = 3040;
 
-Sentry.setupFastifyErrorHandler(app);
-
 app.get('/test-success', function (_req, res) {
   res.send({ version: 'v1' });
 });

dev-packages/e2e-tests/test-applications/nuxt-4/app/app.vue

@@ -13,5 +13,8 @@
   </NuxtLayout>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { useSentryTestTag } from '#imports';
+
+useSentryTestTag();
 </script>

dev-packages/e2e-tests/test-applications/nuxt-4/app/composables/use-sentry-test-tag.ts

@@ -0,0 +1,8 @@
+// fixme: this needs to be imported from @sentry/core, not @sentry/nuxt in dev mode (because of import-in-the-middle error)
+// This could also be a problem with the specific setup of the pnpm E2E test setup, because this could not be reproduced outside of the E2E test.
+// Related to this: https://github.com/getsentry/sentry-javascript/issues/15204#issuecomment-2948908130
+import { setTag } from '@sentry/nuxt';
+
+export default function useSentryTestTag(): void {
+  setTag('test-tag', null);
+}

dev-packages/e2e-tests/test-applications/nuxt-4/modules/another-module.ts

@@ -0,0 +1,9 @@
+import { defineNuxtModule } from 'nuxt/kit';
+
+// Just a fake module to check if the SDK works alongside other local Nuxt modules without breaking the build
+export default defineNuxtModule({
+  meta: { name: 'another-module' },
+  setup() {
+    console.log('another-module setup called');
+  },
+});

dev-packages/e2e-tests/test-applications/nuxt-4/nuxt.config.ts

@@ -1,7 +1,7 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   future: { compatibilityVersion: 4 },
-  compatibilityDate: '2024-04-03',
+  compatibilityDate: '2025-06-06',
   imports: { autoImport: false },
 
   modules: ['@pinia/nuxt', '@sentry/nuxt/module'],

dev-packages/e2e-tests/test-applications/nuxt-4/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@pinia/nuxt": "^0.5.5",
     "@sentry/nuxt": "latest || *",
-    "nuxt": "^3.13.2"
+    "nuxt": "^3.17.5"
   },
   "devDependencies": {
     "@playwright/test": "~1.50.0",

dev-packages/external-contributor-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/external-contributor-gh-action",
   "description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
-  "version": "9.31.0",
+  "version": "9.32.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "9.31.0",
+  "version": "9.32.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -30,9 +30,9 @@
     "@nestjs/common": "11.0.16",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
-    "@sentry/aws-serverless": "9.31.0",
-    "@sentry/core": "9.31.0",
-    "@sentry/node": "9.31.0",
+    "@sentry/aws-serverless": "9.32.0",
+    "@sentry/core": "9.32.0",
+    "@sentry/node": "9.32.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -61,6 +61,7 @@
     "node-cron": "^3.0.3",
     "node-schedule": "^2.1.1",
     "pg": "8.16.0",
+    "postgres": "^3.4.7",
     "proxy": "^2.1.1",
     "redis-4": "npm:redis@^4.6.14",
     "reflect-metadata": "0.2.1",

dev-packages/node-integration-tests/suites/tracing/postgresjs/docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3.9'
+
+services:
+  db:
+    image: postgres:13
+    restart: always
+    container_name: integration-tests-postgresjs
+    ports:
+      - '5444:5432'
+    environment:
+      POSTGRES_USER: test
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test_db