Merge branch 'develop' into onur/remix-type-tests

Author: onurtemizkan

.size-limit.js

@@ -52,7 +52,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '71 KB',
+    limit: '70.1 KB',
     modifyWebpackConfig: function (config) {
       const webpack = require('webpack');
 
@@ -206,7 +206,7 @@ module.exports = [
     import: createImport('init'),
     ignore: ['next/router', 'next/constants'],
     gzip: true,
-    limit: '42.5 KB',
+    limit: '42 KB',
   },
   // SvelteKit SDK (ESM)
   {

CHANGELOG.md

@@ -10,6 +10,27 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.22.0
+
+### Important changes
+
+- **Revert "feat(browser): Track measure detail as span attributes" ([#16348](https://github.com/getsentry/sentry-javascript/pull/16348))**
+
+This is a revert of a feature introduced in `9.20.0` with [#16240](https://github.com/getsentry/sentry-javascript/pull/16240). This feature was causing crashes in firefox, so we are reverting it. We will re-enable this functionality in the future after fixing the crash.
+
+### Other changes
+
+- feat(deps): bump @sentry/rollup-plugin from 3.1.2 to 3.2.1 ([#15511](https://github.com/getsentry/sentry-javascript/pull/15511))
+- fix(remix): Use generic types for `ServerBuild` argument and return ([#16336](https://github.com/getsentry/sentry-javascript/pull/16336))
+
+## 9.21.0
+
+- docs: Fix v7 migration link ([#14629](https://github.com/getsentry/sentry-javascript/pull/14629))
+- feat(node): Vendor in `@fastify/otel` ([#16328](https://github.com/getsentry/sentry-javascript/pull/16328))
+- fix(nestjs): Handle multiple `OnEvent` decorators ([#16306](https://github.com/getsentry/sentry-javascript/pull/16306))
+- fix(node): Avoid creating breadcrumbs for suppressed requests ([#16285](https://github.com/getsentry/sentry-javascript/pull/16285))
+- fix(remix): Add missing `client` exports to `server` and `cloudflare` entries ([#16341](https://github.com/getsentry/sentry-javascript/pull/16341))
+
 Work in this release was contributed by @phthhieu. Thank you for your contribution!
 
 ## 9.20.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.20.0",
+  "version": "9.22.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.20.0",
+    "@sentry/browser": "9.22.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "1.8.2",
     "babel-loader": "^8.2.2",

dev-packages/browser-integration-tests/suites/manual-client/skip-init-browser-extension/test.ts

@@ -23,7 +23,7 @@ sentryTest(
     if (hasDebugLogs()) {
       expect(errorLogs.length).toEqual(1);
       expect(errorLogs[0]).toEqual(
-        '[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
+        '[Sentry] You cannot use Sentry.init() in a browser extension, see: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
       );
     } else {
       expect(errorLogs.length).toEqual(0);

dev-packages/browser-integration-tests/suites/manual-client/skip-init-chrome-extension/test.ts

@@ -21,7 +21,7 @@ sentryTest('should not initialize when inside a Chrome browser extension', async
   if (hasDebugLogs()) {
     expect(errorLogs.length).toEqual(1);
     expect(errorLogs[0]).toEqual(
-      '[Sentry] You cannot run Sentry this way in a browser extension, check: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
+      '[Sentry] You cannot use Sentry.init() in a browser extension, see: https://docs.sentry.io/platforms/javascript/best-practices/browser-extensions/',
     );
   } else {
     expect(errorLogs.length).toEqual(0);

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.20.0",
+  "version": "9.22.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.20.0",
+  "version": "9.22.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

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

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.20.0",
+  "version": "9.22.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.20.0",
+  "version": "9.22.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.20.0",
-    "@sentry/core": "9.20.0",
-    "@sentry/node": "9.20.0",
+    "@sentry/aws-serverless": "9.22.0",
+    "@sentry/core": "9.22.0",
+    "@sentry/node": "9.22.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -60,7 +60,7 @@
     "nock": "^13.5.5",
     "node-cron": "^3.0.3",
     "node-schedule": "^2.1.1",
-    "pg": "^8.7.3",
+    "pg": "8.16.0",
     "proxy": "^2.1.1",
     "redis-4": "npm:redis@^4.6.14",
     "reflect-metadata": "0.2.1",

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

@@ -6,7 +6,7 @@ services:
     restart: always
     container_name: integration-tests-postgres
     ports:
-      - '5444:5432'
+      - '5494:5432'
     environment:
       POSTGRES_USER: test
       POSTGRES_PASSWORD: test

dev-packages/node-integration-tests/suites/tracing/postgres/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "sentry-postgres-test",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "engines": {
+    "node": ">=18"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "pg": "8.16.0",
+    "pg-native": "3.5.0"
+  }
+}

dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.js

@@ -0,0 +1,48 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
+
+// Stop the process from exiting before the transaction is sent
+setInterval(() => {}, 1000);
+
+const { native } = require('pg');
+
+const { Client } = native;
+
+const client = new Client({ port: 5494, user: 'test', password: 'test', database: 'tests' });
+
+async function run() {
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async () => {
+      try {
+        await client.connect();
+
+        await client
+          .query(
+            'CREATE TABLE "NativeUser" ("id" SERIAL NOT NULL,"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,"email" TEXT NOT NULL,"name" TEXT,CONSTRAINT "User_pkey" PRIMARY KEY ("id"));',
+          )
+          .catch(() => {
+            // if this is not a fresh database, the table might already exist
+          });
+
+        await client.query('INSERT INTO "NativeUser" ("email", "name") VALUES ($1, $2)', ['tim', '[email protected]']);
+        await client.query('SELECT * FROM "NativeUser"');
+      } finally {
+        await client.end();
+      }
+    },
+  );
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+run();

dev-packages/node-integration-tests/suites/tracing/postgres/scenario.js

@@ -13,7 +13,7 @@ setInterval(() => {}, 1000);
 
 const { Client } = require('pg');
 
-const client = new Client({ port: 5444, user: 'test', password: 'test', database: 'tests' });
+const client = new Client({ port: 5494, user: 'test', password: 'test', database: 'tests' });
 
 async function run() {
   await Sentry.startSpan(

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

@@ -2,7 +2,7 @@ import { describe, expect, test } from 'vitest';
 import { createRunner } from '../../../utils/runner';
 
 describe('postgres auto instrumentation', () => {
-  test('should auto-instrument `pg` package', { timeout: 60_000 }, async () => {
+  test('should auto-instrument `pg` package', { timeout: 90_000 }, async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'Test Transaction',
       spans: expect.arrayContaining([
@@ -47,7 +47,66 @@ describe('postgres auto instrumentation', () => {
     };
 
     await createRunner(__dirname, 'scenario.js')
-      .withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['port 5432'] })
+      .withDockerCompose({
+        workingDirectory: [__dirname],
+        readyMatches: ['port 5432'],
+        setupCommand: 'yarn',
+      })
+      .expect({ transaction: EXPECTED_TRANSACTION })
+      .start()
+      .completed();
+  });
+
+  test('should auto-instrument `pg-native` package', { timeout: 90_000 }, async () => {
+    const EXPECTED_TRANSACTION = {
+      transaction: 'Test Transaction',
+      spans: expect.arrayContaining([
+        expect.objectContaining({
+          data: expect.objectContaining({
+            'db.system': 'postgresql',
+            'db.name': 'tests',
+            'sentry.origin': 'manual',
+            'sentry.op': 'db',
+          }),
+          description: 'pg.connect',
+          op: 'db',
+          status: 'ok',
+        }),
+        expect.objectContaining({
+          data: expect.objectContaining({
+            'db.system': 'postgresql',
+            'db.name': 'tests',
+            'db.statement': 'INSERT INTO "NativeUser" ("email", "name") VALUES ($1, $2)',
+            'sentry.origin': 'auto.db.otel.postgres',
+            'sentry.op': 'db',
+          }),
+          description: 'INSERT INTO "NativeUser" ("email", "name") VALUES ($1, $2)',
+          op: 'db',
+          status: 'ok',
+          origin: 'auto.db.otel.postgres',
+        }),
+        expect.objectContaining({
+          data: expect.objectContaining({
+            'db.system': 'postgresql',
+            'db.name': 'tests',
+            'db.statement': 'SELECT * FROM "NativeUser"',
+            'sentry.origin': 'auto.db.otel.postgres',
+            'sentry.op': 'db',
+          }),
+          description: 'SELECT * FROM "NativeUser"',
+          op: 'db',
+          status: 'ok',
+          origin: 'auto.db.otel.postgres',
+        }),
+      ]),
+    };
+
+    await createRunner(__dirname, 'scenario-native.js')
+      .withDockerCompose({
+        workingDirectory: [__dirname],
+        readyMatches: ['port 5432'],
+        setupCommand: 'yarn',
+      })
       .expect({ transaction: EXPECTED_TRANSACTION })
       .start()
       .completed();