Merge branch 'develop' into fix/langchain-callbackmanager-preservation

mdnanocom · web-flow · commit 315373d77db0 · 2026-05-21T14:08:27.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @abcang, @ahmadio, and @victorgarciaesgi. Thank you for your contributions!
+Work in this release was contributed by @abcang, @ahmadio, @victorgarciaesgi, and @delorge. Thank you for your contributions!
 
 - **feat(core): Support array attributes for spans, logs, and metrics ([#20427](https://github.com/getsentry/sentry-javascript/pull/20427))**
 
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/additional-listener-test-script.js b/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/additional-listener-test-script.js
@@ -1,5 +1,6 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -11,9 +12,6 @@ process.on('uncaughtException', () => {
   // do nothing - this will prevent the Error below from closing this process before the timeout resolves
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js b/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js
@@ -1,5 +1,6 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -16,9 +17,6 @@ process.on('uncaughtException', () => {
   // do nothing - this will prevent the Error below from closing this process before the timeout resolves
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js b/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js
@@ -1,5 +1,6 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -12,11 +13,6 @@ const client = Sentry.init({
 
 setupOtel(client);
 
-setTimeout(() => {
-  // This should not be called because the script throws before this resolves.
-  // Using 3000ms to account for the SDK's 2000ms shutdown timeout + buffer.
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 3000);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/no-additional-listener-test-script.js b/dev-packages/node-core-integration-tests/suites/public-api/OnUncaughtException/no-additional-listener-test-script.js
@@ -1,17 +1,13 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
 setupOtel(client);
 
-setTimeout(() => {
-  // This should not be called because the script throws before this resolves.
-  // Using 3000ms to account for the SDK's 2000ms shutdown timeout + buffer.
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 3000);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js b/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js
@@ -1,5 +1,6 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,9 +9,6 @@ const client = Sentry.init({
 
 setupOtel(client);
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js b/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js
@@ -1,5 +1,6 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,10 +9,6 @@ const client = Sentry.init({
 
 setupOtel(client);
 
-setTimeout(() => {
-  // should not be called
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js b/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js
@@ -1,15 +1,13 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
 setupOtel(client);
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject(new Error('test rejection'));
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js b/dev-packages/node-core-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js
@@ -1,15 +1,13 @@
 const Sentry = require('@sentry/node-core');
 const { setupOtel } = require('../../../utils/setupOtel.js');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
 setupOtel(client);
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-core-integration-tests/utils/expect-process-to-exit.js b/dev-packages/node-core-integration-tests/utils/expect-process-to-exit.js
@@ -0,0 +1,13 @@
+/**
+ * Sets a watchdog timer that prints "I'm alive!" and exits if the process
+ * doesn't terminate before the timeout. Uses 3000ms to account for the
+ * SDK's 2000ms shutdown timeout + buffer.
+ */
+function expectProcessToExit() {
+  setTimeout(() => {
+    process.stdout.write("I'm alive!");
+    process.exit(0);
+  }, 3000);
+}
+
+module.exports = { expectProcessToExit };
diff --git a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/additional-listener-test-script.js b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/additional-listener-test-script.js
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,9 +9,6 @@ process.on('uncaughtException', () => {
   // do nothing - this will prevent the Error below from closing this process before the timeout resolves
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -13,9 +14,6 @@ process.on('uncaughtException', () => {
   // do nothing - this will prevent the Error below from closing this process before the timeout resolves
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -9,11 +10,6 @@ Sentry.init({
   ],
 });
 
-setTimeout(() => {
-  // This should not be called because the script throws before this resolves.
-  // Using 3000ms to account for the SDK's 2000ms shutdown timeout + buffer.
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 3000);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/no-additional-listener-test-script.js b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/no-additional-listener-test-script.js
@@ -1,14 +1,10 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
-setTimeout(() => {
-  // This should not be called because the script throws before this resolves.
-  // Using 3000ms to account for the SDK's 2000ms shutdown timeout + buffer.
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 3000);
+expectProcessToExit();
 
 throw new Error();
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/ignore-custom-name.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/ignore-custom-name.js
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -18,10 +19,7 @@ class CustomIgnoredError extends Error {
   }
 }
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 // This should be ignored by the custom ignore matcher and not produce a warning
 Promise.reject(new CustomIgnoredError('This error should be ignored'));
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/ignore-default.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/ignore-default.js
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -20,10 +21,7 @@ class AbortError extends Error {
   }
 }
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 // These should be ignored by default and not produce a warning
 Promise.reject(new AI_NoOutputGeneratedError('Stream aborted'));
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js
@@ -1,13 +1,11 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'none' })],
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js
@@ -1,14 +1,11 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
 });
 
-setTimeout(() => {
-  // should not be called
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js
@@ -1,12 +1,10 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject(new Error('test rejection'));
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js
@@ -1,12 +1,10 @@
 const Sentry = require('@sentry/node');
+const { expectProcessToExit } = require('../../../utils/expect-process-to-exit');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
 });
 
-setTimeout(() => {
-  process.stdout.write("I'm alive!");
-  process.exit(0);
-}, 500);
+expectProcessToExit();
 
 Promise.reject('test rejection');
diff --git a/dev-packages/node-integration-tests/utils/expect-process-to-exit.js b/dev-packages/node-integration-tests/utils/expect-process-to-exit.js
@@ -0,0 +1,13 @@
+/**
+ * Sets a watchdog timer that prints "I'm alive!" and exits if the process
+ * doesn't terminate before the timeout. Uses 3000ms to account for the
+ * SDK's 2000ms shutdown timeout + buffer.
+ */
+function expectProcessToExit() {
+  setTimeout(() => {
+    process.stdout.write("I'm alive!");
+    process.exit(0);
+  }, 3000);
+}
+
+module.exports = { expectProcessToExit };
diff --git a/packages/core/src/integrations/supabase.ts b/packages/core/src/integrations/supabase.ts
diff --git a/packages/core/src/logs/internal.ts b/packages/core/src/logs/internal.ts
diff --git a/packages/core/src/tracing/spans/envelope.ts b/packages/core/src/tracing/spans/envelope.ts
diff --git a/packages/core/src/trpc.ts b/packages/core/src/trpc.ts
diff --git a/packages/core/test/lib/integrations/supabase.test.ts b/packages/core/test/lib/integrations/supabase.test.ts
diff --git a/packages/core/test/lib/tracing/spans/envelope.test.ts b/packages/core/test/lib/tracing/spans/envelope.test.ts
diff --git a/packages/core/test/lib/trpc.test.ts b/packages/core/test/lib/trpc.test.ts
diff --git a/packages/nextjs/src/config/types.ts b/packages/nextjs/src/config/types.ts
