meta(changelog): Update changelog for 9.7.0

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
  gzip: true,
- limit: '75.2 KB',
+ limit: '75.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
  path: 'packages/browser/build/npm/esm/index.js',
  import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
  gzip: true,
- limit: '80 KB',
+ limit: '80.5 KB',
  },
  {
  name: '@sentry/browser (incl. Tracing, Replay, Feedback)',

CHANGELOG.md

@@ -10,6 +10,15 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.7.0
+
+- feat(core): Add `captureLog` method ([#15717](https://github.com/getsentry/sentry-javascript/pull/15717))
+- feat(remix/cloudflare): Export `sentryHandleError` ([#15726](https://github.com/getsentry/sentry-javascript/pull/15726))
+- fix(node): Always flush on Vercel before Lambda freeze ([#15602](https://github.com/getsentry/sentry-javascript/pull/15602))
+- fix(node): Ensure incoming traces are propagated without HttpInstrumentation ([#15732](https://github.com/getsentry/sentry-javascript/pull/15732))
+- fix(node): Use `fatal` level for unhandled rejections in `strict` mode ([#15720](https://github.com/getsentry/sentry-javascript/pull/15720))
+- fix(nuxt): Delete Nuxt server template injection ([#15749](https://github.com/getsentry/sentry-javascript/pull/15749))
+
 ## 9.6.1
 
 - feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-none.js

@@ -0,0 +1,13 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-strict.js

@@ -0,0 +1,14 @@
+const Sentry = require('@sentry/node');
+
+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);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-error.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject(new Error('test rejection'));

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/mode-warn-string.js

@@ -0,0 +1,12 @@
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
+
+setTimeout(() => {
+ process.stdout.write("I'm alive!");
+ process.exit(0);
+}, 500);
+
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts

@@ -0,0 +1,12 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+ integrations: [Sentry.onUnhandledRejectionIntegration({ mode: 'strict' })],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts

@@ -0,0 +1,11 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Promise.reject('test rejection');

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

@@ -0,0 +1,127 @@
+import * as childProcess from 'child_process';
+import * as path from 'path';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses } from '../../../utils/runner';
+import { createRunner } from '../../../utils/runner';
+
+describe('onUnhandledRejectionIntegration', () => {
+ afterAll(() => {
+ cleanupChildProcesses();
+ });
+
+ test('should show string-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-string.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr.trim())
+ .toBe(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should show error-type promise rejection warnings by default', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-warn-error.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+Error: test rejection
+ at Object.<anonymous>`);
+ done();
+ });
+ }));
+
+ test('should not close process on unhandled rejection in strict mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(4);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-strict.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).not.toBeNull();
+ expect(err?.code).toBe(1);
+ expect(stdout).not.toBe("I'm alive!");
+ expect(stderr)
+ .toContain(`This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). The promise rejected with the reason:
+test rejection`);
+ done();
+ });
+ }));
+
+ test('should not close process or warn on unhandled rejection in none mode', () =>
+ new Promise<void>(done => {
+ expect.assertions(3);
+
+ const testScriptPath = path.resolve(__dirname, 'mode-none.js');
+
+ childProcess.execFile('node', [testScriptPath], { encoding: 'utf8' }, (err, stdout, stderr) => {
+ expect(err).toBeNull();
+ expect(stdout).toBe("I'm alive!");
+ expect(stderr).toBe('');
+ done();
+ });
+ }));
+
+ test('captures exceptions for unhandled rejections', async () => {
+ await createRunner(__dirname, 'scenario-warn.ts')
+ .expect({
+ event: {
+ level: 'error',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+
+ test('captures exceptions for unhandled rejections in strict mode', async () => {
+ await createRunner(__dirname, 'scenario-strict.ts')
+ .expect({
+ event: {
+ level: 'fatal',
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'test rejection',
+ mechanism: {
+ type: 'onunhandledrejection',
+ handled: false,
+ },
+ stacktrace: {
+ frames: expect.any(Array),
+ },
+ },
+ ],
+ },
+ },
+ })
+ .start()
+ .completed();
+ });
+});

docs/publishing-a-release.md

@@ -20,9 +20,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  [@getsentry/releases-approvers](https://github.com/orgs/getsentry/teams/release-approvers) to approve the release. a.
  Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
-## Publishing a release for previous majors
+## Publishing a release for previous majors or prerelease (alpha, beta) versions
 
-1. Run `yarn changelog` on a previous major branch (e.g. `v8`) and determine what version will be released (we use
+1. Run `yarn changelog` on a previous major branch (e.g. `v8` or `9.7.0-alpha`) and determine what version will be released (we use
  [semver](https://semver.org))
 2. Create a branch, e.g. `changelog-8.45.1`, off a previous major branch (e.g. `v8`)
 3. Update `CHANGELOG.md` to add an entry for the next release number and a list of changes since the
@@ -32,9 +32,9 @@ _These steps are only relevant to Sentry employees when preparing and publishing
  (as the commits already exist on this branch).
 6. Once the PR is merged, open the [Prepare Release workflow](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) and
  fill in ![run-release-workflow.png](./assets/run-release-workflow.png)
- 1. The major branch you want to release for, e.g. `v8`
- 2. The version you want to release, e.g. `8.45.1`
- 3. The major branch to merge into, e.g. `v8`
+ 1. The major branch you want to release for, e.g. `v8` or `9.7.0-alpha`
+ 2. The version you want to release, e.g. `8.45.1` `9.7.0-alpha.1`
+ 3. The major branch to merge into, e.g. `v8` `9.7.0-alpha`
 7. Run the release workflow
 
 ## Updating the Changelog

packages/browser/src/client.ts

@@ -15,6 +15,7 @@ import {
  addAutoIpAddressToUser,
  applySdkMetadata,
  getSDKSource,
+ _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
@@ -85,6 +86,9 @@ export class BrowserClient extends Client<BrowserClientOptions> {
  WINDOW.document.addEventListener('visibilitychange', () => {
  if (WINDOW.document.visibilityState === 'hidden') {
  this._flushOutcomes();
+ if (this._options._experiments?.enableLogs) {
+ _INTERNAL_flushLogsBuffer(this);
+ }
  }
  });
  }

packages/core/src/client.ts

@@ -28,6 +28,7 @@ import type {
  SpanContextData,
  SpanJSON,
  StartSpanOptions,
+ TraceContext,
  TransactionEvent,
  Transport,
  TransportMakeRequestResponse,
@@ -44,7 +45,10 @@ import { afterSetupIntegrations } from './integration';
 import { setupIntegration, setupIntegrations } from './integration';
 import type { Scope } from './scope';
 import { updateSession } from './session';
-import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
 import { createClientReportEnvelope } from './utils-hoist/clientreport';
 import { dsnToString, makeDsn } from './utils-hoist/dsn';
 import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
@@ -57,8 +61,9 @@ import { getPossibleEventMessages } from './utils/eventUtils';
 import { merge } from './utils/merge';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { showSpanDropWarning } from './utils/spanUtils';
+import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
 import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
@@ -617,7 +622,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
  public on(hook: 'close', callback: () => void): () => void;
 
  /**
- * Register a hook oin this client.
+ * Register a hook on this client.
  */
  public on(hook: string, callback: unknown): () => void {
  const hooks = (this._hooks[hook] = this._hooks[hook] || []);
@@ -1256,3 +1261,20 @@ function isErrorEvent(event: Event): event is ErrorEvent {
 function isTransactionEvent(event: Event): event is TransactionEvent {
  return event.type === 'transaction';
 }
+
+/** Extract trace information from scope */
+export function _getTraceInfoFromScope(
+ client: Client,
+ scope: Scope | undefined,
+): [dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined, traceContext: TraceContext | undefined] {
+ if (!scope) {
+ return [undefined, undefined];
+ }
+
+ const span = _getSpanForScope(scope);
+ const traceContext = span ? spanToTraceContext(span) : getTraceContextFromScope(scope);
+ const dynamicSamplingContext = span
+ ? getDynamicSamplingContextFromSpan(span)
+ : getDynamicSamplingContextFromScope(client, scope);
+ return [dynamicSamplingContext, traceContext];
+}

packages/core/src/index.ts

@@ -113,6 +113,7 @@ export { instrumentFetchRequest } from './fetch';
 export { trpcMiddleware } from './trpc';
 export { captureFeedback } from './feedback';
 export type { ReportDialogOptions } from './report-dialog';
+export { _INTERNAL_flushLogsBuffer } from './logs';
 
 // TODO: Make this structure pretty again and don't do "export *"
 export * from './utils-hoist/index';

packages/core/src/logs/constants.ts

@@ -0,0 +1,15 @@
+import type { LogSeverityLevel } from '../types-hoist';
+
+/**
+ * Maps a log severity level to a log severity number.
+ *
+ * @see LogSeverityLevel
+ */
+export const SEVERITY_TEXT_TO_SEVERITY_NUMBER: Partial<Record<LogSeverityLevel, number>> = {
+ trace: 1,
+ debug: 5,
+ info: 9,
+ warn: 13,
+ error: 17,
+ fatal: 21,
+};