Merge branch 'develop' into timfish/feat/node-propagateTraceparent

Author: timfish

.size-limit.js

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

dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json

@@ -15,7 +15,7 @@
     "test:dev": "TEST_ENV=development playwright test"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.22.0",
+    "@modelcontextprotocol/sdk": "1.24.0",
     "@sentry/cloudflare": "latest || *",
     "agents": "^0.2.23",
     "zod": "^3.25.76"

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

@@ -27,7 +27,7 @@
     "@sentry/core": "latest || *",
     "ai": "^3.0.0",
     "import-in-the-middle": "^2",
-    "next": "16.0.9",
+    "next": "16.0.10",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^8",

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

@@ -19,7 +19,7 @@
     "@sentry/nextjs": "latest || *",
     "@orpc/server": "latest",
     "@orpc/client": "latest",
-    "next": "14.2.32",
+    "next": "14.2.35",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "server-only": "^0.0.1"

dev-packages/node-integration-tests/suites/tracing/postgresjs/instrument-requestHook.cjs

@@ -0,0 +1,25 @@
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+  integrations: [
+    Sentry.postgresJsIntegration({
+      requestHook: (span, sanitizedSqlQuery, connectionContext) => {
+        // Add custom attributes to demonstrate requestHook functionality
+        span.setAttribute('custom.requestHook', 'called');
+
+        // Set context information as extras for test validation
+        Sentry.setExtra('requestHookCalled', {
+          sanitizedQuery: sanitizedSqlQuery,
+          database: connectionContext?.ATTR_DB_NAMESPACE,
+          host: connectionContext?.ATTR_SERVER_ADDRESS,
+          port: connectionContext?.ATTR_SERVER_PORT,
+        });
+      },
+    }),
+  ],
+});

dev-packages/node-integration-tests/suites/tracing/postgresjs/instrument-requestHook.mjs

@@ -0,0 +1,25 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+  integrations: [
+    Sentry.postgresJsIntegration({
+      requestHook: (span, sanitizedSqlQuery, connectionContext) => {
+        // Add custom attributes to demonstrate requestHook functionality
+        span.setAttribute('custom.requestHook', 'called');
+
+        // Set context information as extras for test validation
+        Sentry.setExtra('requestHookCalled', {
+          sanitizedQuery: sanitizedSqlQuery,
+          database: connectionContext?.ATTR_DB_NAMESPACE,
+          host: connectionContext?.ATTR_SERVER_ADDRESS,
+          port: connectionContext?.ATTR_SERVER_PORT,
+        });
+      },
+    }),
+  ],
+});

dev-packages/node-integration-tests/suites/tracing/postgresjs/instrument.cjs

@@ -0,0 +1,9 @@
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});

dev-packages/node-integration-tests/suites/tracing/postgresjs/instrument.mjs

@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});

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

@@ -0,0 +1,39 @@
+const Sentry = require('@sentry/node');
+const postgres = require('postgres');
+
+// Stop the process from exiting before the transaction is sent
+setInterval(() => {}, 1000);
+
+const sql = postgres({ port: 5444, user: 'test', password: 'test', database: 'test_db' });
+
+async function run() {
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async () => {
+      try {
+        await sql`
+          CREATE TABLE "User" ("id" SERIAL NOT NULL,"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,"email" TEXT NOT NULL,"name" TEXT,CONSTRAINT "User_pkey" PRIMARY KEY ("id"));
+        `;
+
+        await sql`
+          INSERT INTO "User" ("email", "name") VALUES ('Foo', 'bar@baz.com');
+        `;
+
+        await sql`
+          SELECT * FROM "User" WHERE "email" = 'bar@baz.com';
+        `;
+
+        await sql`
+          DROP TABLE "User";
+        `;
+      } finally {
+        await sql.end();
+      }
+    },
+  );
+}
+
+run();

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario-requestHook.mjs

@@ -0,0 +1,39 @@
+import * as Sentry from '@sentry/node';
+import postgres from 'postgres';
+
+// Stop the process from exiting before the transaction is sent
+setInterval(() => {}, 1000);
+
+const sql = postgres({ port: 5444, user: 'test', password: 'test', database: 'test_db' });
+
+async function run() {
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async () => {
+      try {
+        await sql`
+          CREATE TABLE "User" ("id" SERIAL NOT NULL,"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,"email" TEXT NOT NULL,"name" TEXT,CONSTRAINT "User_pkey" PRIMARY KEY ("id"));
+        `;
+
+        await sql`
+          INSERT INTO "User" ("email", "name") VALUES ('Foo', 'bar@baz.com');
+        `;
+
+        await sql`
+          SELECT * FROM "User" WHERE "email" = 'bar@baz.com';
+        `;
+
+        await sql`
+          DROP TABLE "User";
+        `;
+      } finally {
+        await sql.end();
+      }
+    },
+  );
+}
+
+run();