Merge branch 'develop' into nh/ref-remove-is-orchestrion-enabled

# Conflicts:
#	dev-packages/node-integration-tests/suites/tracing/mongodb-v7/test.ts
#	dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts
#	dev-packages/node-integration-tests/suites/tracing/mongoose-v9/test.ts

Author: nicohrubec

dev-packages/cloudflare-integration-tests/suites/types/withsentry.ts

@@ -23,7 +23,7 @@ interface ManualEnv {
 export const reproduction = withSentry(
   env => {
     expectTypeOf(env).toEqualTypeOf<ManualEnv>();
-    return { dsn: env.SENTRY_DATA_SOURCE_NAME, sendDefaultPii: true };
+    return { dsn: env.SENTRY_DATA_SOURCE_NAME };
   },
   {
     fetch(_, env) {

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

@@ -68,7 +68,7 @@
     "fastify": "^5.7.0",
     "generic-pool": "^3.9.0",
     "graphql": "^16.11.0",
-    "graphql-tag": "^2.12.6",
+    "graphql-tag": "^2.12.7",
     "hono": "^4.12.34",
     "http-terminator": "^3.2.0",
     "ioredis": "5.10.1",

dev-packages/node-integration-tests/suites/breadcrumbs/process-thread/test.ts

@@ -1,6 +1,5 @@
 import type { Event } from '@sentry/core';
-import { afterAll, expect, test } from 'vitest';
-import { conditionalTest } from '../../../utils';
+import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
 const EVENT = {
@@ -35,7 +34,7 @@ const EVENT = {
   ],
 };
 
-conditionalTest({ min: 20 })('should capture process and thread breadcrumbs', () => {
+describe('should capture process and thread breadcrumbs', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });

dev-packages/node-integration-tests/suites/child-process/test.ts

@@ -1,6 +1,5 @@
 import type { Event } from '@sentry/core';
 import { afterAll, describe, expect, test } from 'vitest';
-import { conditionalTest } from '../../utils';
 import { cleanupChildProcesses, createRunner } from '../../utils/runner';
 
 const WORKER_EVENT: Event = {
@@ -44,7 +43,7 @@ describe('should capture child process events', () => {
     cleanupChildProcesses();
   });
 
-  conditionalTest({ min: 20 })('worker', () => {
+  describe('worker', () => {
     test('ESM', async () => {
       await createRunner(__dirname, 'worker.mjs').expect({ event: WORKER_EVENT }).start().completed();
     });
@@ -54,7 +53,7 @@ describe('should capture child process events', () => {
     });
   });
 
-  conditionalTest({ min: 20 })('fork', () => {
+  describe('fork', () => {
     test('ESM', async () => {
       await createRunner(__dirname, 'fork.mjs').expect({ event: CHILD_EVENT }).start().completed();
     });

dev-packages/node-integration-tests/suites/esm/warn-esm/test.ts

@@ -7,25 +7,7 @@ afterAll(() => {
 
 const esmWarning = `[Sentry] You are using Node.js v${process.versions.node} in ESM mode ("import syntax"). The Sentry Node.js SDK is not compatible with ESM in Node.js versions before 18.19.0 or before 20.6.0. Please either build your application with CommonJS ("require() syntax"), or upgrade your Node.js version.`;
 
-test("warns if using ESM on Node.js versions that don't support `register()`", async () => {
-  const nodeMajorVersion = Number(process.versions.node.split('.')[0]);
-  if (nodeMajorVersion >= 18) {
-    return;
-  }
-
-  const runner = createRunner(__dirname, 'server.mjs').ignore('event').start();
-
-  await runner.makeRequest('get', '/test/success');
-
-  expect(runner.getLogs()).toContain(esmWarning);
-});
-
 test('does not warn if using ESM on Node.js versions that support `register()`', async () => {
-  const nodeMajorVersion = Number(process.versions.node.split('.')[0]);
-  if (nodeMajorVersion < 18) {
-    return;
-  }
-
   const runner = createRunner(__dirname, 'server.mjs').ignore('event').start();
 
   await runner.makeRequest('get', '/test/success');

dev-packages/node-integration-tests/suites/pino/test.ts

@@ -1,8 +1,7 @@
-import { afterAll, expect } from 'vitest';
-import { conditionalTest } from '../../utils';
+import { afterAll, describe, expect } from 'vitest';
 import { cleanupChildProcesses, createEsmTests } from '../../utils/runner';
 
-conditionalTest({ min: 20 })('Pino integration', () => {
+describe('Pino integration', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });

dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

@@ -1,7 +1,6 @@
 import { mkdirSync, rmdirSync, unlinkSync, writeFileSync } from 'fs';
 import * as path from 'path';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
-import { conditionalTest } from '../../../utils';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
 // This test takes some time because it connects the debugger etc.
@@ -108,19 +107,15 @@ module.exports = { out_of_app_function };`,
       .completed();
   });
 
-  conditionalTest({ min: 19 })('Node v19+', () => {
-    test('Should not import inspector when not in use', async () => {
-      await createRunner(__dirname, 'deny-inspector.mjs').ensureNoErrorOutput().start().completed();
-    });
+  test('Should not import inspector when not in use', async () => {
+    await createRunner(__dirname, 'deny-inspector.mjs').ensureNoErrorOutput().start().completed();
   });
 
-  conditionalTest({ min: 20 })('Node v20+', () => {
-    test('Should retain original local variables when error is re-thrown', async () => {
-      await createRunner(__dirname, 'local-variables-rethrow.js')
-        .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
-        .start()
-        .completed();
-    });
+  test('Should retain original local variables when error is re-thrown', async () => {
+    await createRunner(__dirname, 'local-variables-rethrow.js')
+      .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
+      .start()
+      .completed();
   });
 
   test('Includes local variables for caught exceptions when enabled', async () => {

dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts

@@ -1,7 +1,6 @@
 import * as childProcess from 'child_process';
 import * as path from 'path';
 import { describe, expect, test } from 'vitest';
-import { conditionalTest } from '../../../utils';
 import { createRunner } from '../../../utils/runner';
 
 describe('OnUncaughtException integration', () => {
@@ -103,37 +102,7 @@ describe('OnUncaughtException integration', () => {
       .completed();
   });
 
-  conditionalTest({ max: 18 })('Worker thread error handling Node 18', () => {
-    test('should capture uncaught worker thread errors - without childProcess integration', async () => {
-      await createRunner(__dirname, 'worker-thread/uncaught-worker.mjs')
-        .withInstrument(path.join(__dirname, 'worker-thread/instrument.mjs'))
-        .expect({
-          event: {
-            level: 'fatal',
-            exception: {
-              values: [
-                {
-                  type: 'Error',
-                  value: 'job failed',
-                  mechanism: {
-                    type: 'auto.node.onuncaughtexception',
-                    handled: false,
-                  },
-                  stacktrace: {
-                    frames: expect.any(Array),
-                  },
-                },
-              ],
-            },
-          },
-        })
-        .start()
-        .completed();
-    });
-  });
-
-  // childProcessIntegration only exists in Node 20+
-  conditionalTest({ min: 20 })('Worker thread error handling Node 20+', () => {
+  describe('Worker thread error handling', () => {
     test.each(['mjs', 'js'])('should not interfere with worker thread error handling ".%s"', async extension => {
       const runner = createRunner(__dirname, `worker-thread/caught-worker.${extension}`)
         .withFlags('--import', path.join(__dirname, `worker-thread/instrument.${extension}`))

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

@@ -1,14 +1,12 @@
 import { afterAll, describe, expect } from 'vitest';
-import { conditionalTest } from '../../../utils';
 import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
 
 describe('fastify auto-instrumentation', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });
 
-  // Fastify v5 does not support Node 18
-  conditionalTest({ min: 20 })('fastify v5', () => {
+  describe('fastify v5', () => {
     createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
       test('creates transaction with fastify hook, request-handler and manual spans', async () => {
         const runner = createRunner()
@@ -50,10 +48,9 @@ describe('fastify auto-instrumentation', () => {
       });
 
       // Fastify v5 only publishes the `tracing:fastify.request.handler:error` diagnostics channel when
-      // `tracingChannel(...).hasSubscribers` is truthy. That aggregate getter does not exist on Node 18
-      // (it was added in Node 20), so fastify takes the fast path and never publishes the channel there —
-      // making automatic error capture (without `setupFastifyErrorHandler`) impossible on Node 18.
-      conditionalTest({ min: 20 })('error capture via diagnostics channel', () => {
+      // `tracingChannel(...).hasSubscribers` is truthy, which is what enables automatic error capture
+      // without `setupFastifyErrorHandler`.
+      describe('error capture via diagnostics channel', () => {
         test('captures errors thrown in route handlers', async () => {
           const runner = createRunner()
             .ignore('transaction')

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

@@ -19,31 +19,6 @@ Sentry.init({
           resMethod: res.req.method,
         });
       },
-      instrumentation: {
-        requestHook: (span, req) => {
-          span.setAttribute('attr1', 'yes');
-          Sentry.setExtra('requestHookCalled', {
-            url: req.url,
-            method: req.method,
-          });
-        },
-        responseHook: (span, res) => {
-          span.setAttribute('attr2', 'yes');
-          Sentry.setExtra('responseHookCalled', {
-            url: res.req.url,
-            method: res.req.method,
-          });
-        },
-        applyCustomAttributesOnSpan: (span, req, res) => {
-          span.setAttribute('attr3', 'yes');
-          Sentry.setExtra('applyCustomAttributesOnSpanCalled', {
-            reqUrl: req.url,
-            reqMethod: req.method,
-            resUrl: res.req.url,
-            resMethod: res.req.method,
-          });
-        },
-      },
     }),
   ],
 });