feat!: Remove autoSessionTracking option (#14802)

Luca Forstner · web-flow · commit e8e84eae2456 · 2025-01-08T10:55:45.000+01:00
Ref #14609
diff --git a/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/init.js b/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/init.js
@@ -6,6 +6,5 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [captureConsoleIntegration()],
-  autoSessionTracking: false,
   attachStacktrace: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/integrations/captureConsole/init.js b/dev-packages/browser-integration-tests/suites/integrations/captureConsole/init.js
@@ -6,5 +6,4 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [captureConsoleIntegration()],
-  autoSessionTracking: false,
 });
diff --git a/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/init.js b/dev-packages/browser-integration-tests/suites/sessions/v7-hub-start-session/init.js
@@ -5,8 +5,6 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '0.1',
-  // intentionally disabling this, we want to leverage the deprecated hub API
-  autoSessionTracking: false,
 });
 
 // simulate old startSessionTracking behavior
diff --git a/dev-packages/node-integration-tests/suites/anr/app-path.mjs b/dev-packages/node-integration-tests/suites/anr/app-path.mjs
@@ -16,7 +16,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100, appRootPath: __dirname })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/basic-multiple.mjs b/dev-packages/node-integration-tests/suites/anr/basic-multiple.mjs
@@ -12,7 +12,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100, maxAnrEvents: 2 })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/basic-session.js b/dev-packages/node-integration-tests/suites/anr/basic-session.js
@@ -11,7 +11,6 @@ Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
-  autoSessionTracking: true,
 });
 
 Sentry.setUser({ email: 'person@home.com' });
diff --git a/dev-packages/node-integration-tests/suites/anr/basic.js b/dev-packages/node-integration-tests/suites/anr/basic.js
@@ -12,7 +12,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/basic.mjs b/dev-packages/node-integration-tests/suites/anr/basic.mjs
@@ -12,7 +12,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/forked.js b/dev-packages/node-integration-tests/suites/anr/forked.js
@@ -10,7 +10,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   debug: true,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
diff --git a/dev-packages/node-integration-tests/suites/anr/indefinite.mjs b/dev-packages/node-integration-tests/suites/anr/indefinite.mjs
@@ -10,7 +10,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/isolated.mjs b/dev-packages/node-integration-tests/suites/anr/isolated.mjs
@@ -10,7 +10,6 @@ setTimeout(() => {
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/anr/should-exit-forced.js b/dev-packages/node-integration-tests/suites/anr/should-exit-forced.js
@@ -4,7 +4,6 @@ function configureSentry() {
   Sentry.init({
     dsn: 'https://public@dsn.ingest.sentry.io/1337',
     release: '1.0',
-    autoSessionTracking: false,
     debug: true,
     integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
diff --git a/dev-packages/node-integration-tests/suites/anr/should-exit.js b/dev-packages/node-integration-tests/suites/anr/should-exit.js
@@ -4,7 +4,6 @@ function configureSentry() {
   Sentry.init({
     dsn: 'https://public@dsn.ingest.sentry.io/1337',
     release: '1.0',
-    autoSessionTracking: false,
     debug: true,
     integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
diff --git a/dev-packages/node-integration-tests/suites/anr/stop-and-start.js b/dev-packages/node-integration-tests/suites/anr/stop-and-start.js
@@ -13,7 +13,6 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   debug: true,
-  autoSessionTracking: false,
   integrations: [anr],
 });
 
diff --git a/dev-packages/node-integration-tests/suites/contextLines/instrument.mjs b/dev-packages/node-integration-tests/suites/contextLines/instrument.mjs
@@ -4,6 +4,5 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/contextLines/scenario with space.cjs b/dev-packages/node-integration-tests/suites/contextLines/scenario with space.cjs
@@ -4,7 +4,6 @@ const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
 });
 
diff --git a/dev-packages/node-integration-tests/suites/contextLines/test.ts b/dev-packages/node-integration-tests/suites/contextLines/test.ts
@@ -55,17 +55,17 @@ describe('ContextLines integration in CJS', () => {
                       filename: expect.stringMatching(/\/scenario with space.cjs$/),
                       context_line: "Sentry.captureException(new Error('Test Error'));",
                       pre_context: [
+                        '',
                         'Sentry.init({',
                         "  dsn: 'https://public@dsn.ingest.sentry.io/1337',",
                         "  release: '1.0',",
-                        '  autoSessionTracking: false,',
                         '  transport: loggingTransport,',
                         '});',
                         '',
                       ],
                       post_context: ['', '// some more post context'],
                       colno: 25,
-                      lineno: 11,
+                      lineno: 10,
                       function: 'Object.?',
                       in_app: true,
                       module: 'scenario with space',
diff --git a/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts b/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts
@@ -5,7 +5,6 @@ import { CronJob } from 'cron';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
 });
 
diff --git a/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts b/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts
@@ -5,7 +5,6 @@ import * as cron from 'node-cron';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
 });
 
diff --git a/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts b/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts
@@ -5,7 +5,6 @@ import * as schedule from 'node-schedule';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
 });
 
diff --git a/dev-packages/node-integration-tests/suites/esm/import-in-the-middle/app.mjs b/dev-packages/node-integration-tests/suites/esm/import-in-the-middle/app.mjs
@@ -11,7 +11,6 @@ new iitm.Hook((_, name) => {
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   transport: loggingTransport,
   registerEsmLoaderHooks: { onlyIncludeInstrumentedModules: true },
 });
diff --git a/dev-packages/node-integration-tests/suites/esm/modules-integration/app.mjs b/dev-packages/node-integration-tests/suites/esm/modules-integration/app.mjs
@@ -4,7 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  autoSessionTracking: false,
   integrations: [Sentry.modulesIntegration()],
   transport: loggingTransport,
 });
diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts
@@ -23,7 +23,7 @@ import { IS_DEBUG_BUILD } from './flags';
 /**
  * Get the default integrations for the Angular SDK.
  */
-export function getDefaultIntegrations(options: BrowserOptions = {}): Integration[] {
+export function getDefaultIntegrations(_options: BrowserOptions = {}): Integration[] {
   // Don't include the BrowserApiErrors integration as it interferes with the Angular SDK's `ErrorHandler`:
   // BrowserApiErrors would catch certain errors before they reach the `ErrorHandler` and
   // thus provide a lower fidelity error than what `SentryErrorHandler`
@@ -32,22 +32,16 @@ export function getDefaultIntegrations(options: BrowserOptions = {}): Integratio
   // see:
   //  - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
   //  - https://github.com/getsentry/sentry-javascript/issues/2744
-  const integrations = [
+  return [
     inboundFiltersIntegration(),
     functionToStringIntegration(),
     breadcrumbsIntegration(),
     globalHandlersIntegration(),
     linkedErrorsIntegration(),
     dedupeIntegration(),
     httpContextIntegration(),
+    browserSessionIntegration(),
   ];
-
-  // eslint-disable-next-line deprecation/deprecation
-  if (options.autoSessionTracking !== false) {
-    integrations.push(browserSessionIntegration());
-  }
-
-  return integrations;
 }
 
 /**
diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
@@ -27,12 +27,12 @@ import { defaultStackParser } from './stack-parsers';
 import { makeFetchTransport } from './transports/fetch';
 
 /** Get the default integrations for the browser SDK. */
-export function getDefaultIntegrations(options: Options): Integration[] {
+export function getDefaultIntegrations(_options: Options): Integration[] {
   /**
    * Note: Please make sure this stays in sync with Angular SDK, which re-exports
    * `getDefaultIntegrations` but with an adjusted set of integrations.
    */
-  const integrations = [
+  return [
     inboundFiltersIntegration(),
     functionToStringIntegration(),
     browserApiErrorsIntegration(),
@@ -41,14 +41,8 @@ export function getDefaultIntegrations(options: Options): Integration[] {
     linkedErrorsIntegration(),
     dedupeIntegration(),
     httpContextIntegration(),
+    browserSessionIntegration(),
   ];
-
-  // eslint-disable-next-line deprecation/deprecation
-  if (options.autoSessionTracking !== false) {
-    integrations.push(browserSessionIntegration());
-  }
-
-  return integrations;
 }
 
 /** Exported only for tests. */
@@ -61,7 +55,6 @@ export function applyDefaultOptions(optionsArg: BrowserOptions = {}): BrowserOpt
         : WINDOW.SENTRY_RELEASE && WINDOW.SENTRY_RELEASE.id // This supports the variable that sentry-webpack-plugin injects
           ? WINDOW.SENTRY_RELEASE.id
           : undefined,
-    autoSessionTracking: true,
     sendClientReports: true,
   };
 
diff --git a/packages/browser/test/sdk.test.ts b/packages/browser/test/sdk.test.ts
@@ -286,7 +286,6 @@ describe('applyDefaultOptions', () => {
     expect(actual).toEqual({
       defaultIntegrations: expect.any(Array),
       release: undefined,
-      autoSessionTracking: true,
       sendClientReports: true,
     });
 
@@ -299,14 +298,12 @@ describe('applyDefaultOptions', () => {
     const options = {
       tracesSampleRate: 0.5,
       release: '1.0.0',
-      autoSessionTracking: false,
     };
     const actual = applyDefaultOptions(options);
 
     expect(actual).toEqual({
       defaultIntegrations: expect.any(Array),
       release: '1.0.0',
-      autoSessionTracking: false,
       sendClientReports: true,
       tracesSampleRate: 0.5,
     });
diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
@@ -24,16 +24,6 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
   /** Attaches stacktraces to pure capture message / log integrations */
   attachStacktrace?: boolean;
 
-  /**
-   * A flag enabling Sessions Tracking feature.
-   * By default, Session Tracking is enabled.
-   *
-   * @deprecated Setting the `autoSessionTracking` option is deprecated.
-   * To enable session tracking, it is recommended to unset `autoSessionTracking` and ensure that either, in browser environments the `browserSessionIntegration` is added, or in server environments the `httpIntegration` is added.
-   * To disable session tracking, it is recommended unset `autoSessionTracking` and to remove the `browserSessionIntegration` in browser environments, or in server environments configure the `httpIntegration` with the `trackIncomingRequestsAsSessions` option set to `false`.
-   */
-  autoSessionTracking?: boolean;
-
   /**
    * Send SDK Client Reports. When calling `Sentry.init()`, this option defaults to `true`.
    */
diff --git a/packages/feedback/src/core/mockSdk.ts b/packages/feedback/src/core/mockSdk.ts
@@ -46,7 +46,6 @@ export async function mockSdk({ sentryOptions }: MockSdkParams = {}): Promise<vo
   init({
     ...getDefaultClientOptions(),
     dsn: 'https://dsn@ingest.f00.f00/1',
-    autoSessionTracking: false,
     sendClientReports: false,
     transport: () => new MockTransport(),
     replaysSessionSampleRate: 0.0,
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
@@ -117,8 +117,6 @@ export function init(options: NodeOptions): NodeClient | undefined {
     environment: process.env.SENTRY_ENVIRONMENT || getVercelEnv(false) || process.env.NODE_ENV,
     defaultIntegrations: customDefaultIntegrations,
     ...options,
-    // Right now we only capture frontend sessions for Next.js
-    autoSessionTracking: false,
   };
 
   if (DEBUG_BUILD && opts.debug) {
diff --git a/packages/nextjs/test/serverSdk.test.ts b/packages/nextjs/test/serverSdk.test.ts
@@ -48,7 +48,6 @@ describe('Server init()', () => {
             ],
           },
         },
-        autoSessionTracking: false,
         environment: 'test',
 
         // Integrations are tested separately, and we can't be more specific here without depending on the order in
diff --git a/packages/node/src/sdk/index.ts b/packages/node/src/sdk/index.ts
@@ -213,15 +213,6 @@ function getClientOptions(
 ): NodeClientOptions {
   const release = getRelease(options.release);
 
-  const autoSessionTracking =
-    typeof release !== 'string'
-      ? false
-      : // eslint-disable-next-line deprecation/deprecation
-        options.autoSessionTracking === undefined
-        ? true
-        : // eslint-disable-next-line deprecation/deprecation
-          options.autoSessionTracking;
-
   if (options.spotlight == null) {
     const spotlightEnv = envToBool(process.env.SENTRY_SPOTLIGHT, { strict: true });
     if (spotlightEnv == null) {
@@ -242,7 +233,6 @@ function getClientOptions(
 
   const overwriteOptions = dropUndefinedKeys({
     release,
-    autoSessionTracking,
     tracesSampleRate,
   });
 
diff --git a/packages/remix/test/integration/instrument.server.cjs b/packages/remix/test/integration/instrument.server.cjs
@@ -4,7 +4,5 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   tracesSampleRate: 1,
   tracePropagationTargets: ['example.org'],
-  // Disabling to test series of envelopes deterministically.
-  autoSessionTracking: false,
   autoInstrumentRemix: process.env.USE_OTEL === '1',
 });
diff --git a/packages/replay-internal/test/mocks/mockSdk.ts b/packages/replay-internal/test/mocks/mockSdk.ts
@@ -75,7 +75,6 @@ export async function mockSdk({ replayOptions, sentryOptions, autoStart = true }
   const client = init({
     ...getDefaultClientOptions(),
     dsn: 'https://dsn@ingest.f00.f00/1',
-    autoSessionTracking: false,
     sendClientReports: false,
     transport: () => new MockTransport(),
     replaysSessionSampleRate: 1.0,
diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts
@@ -85,22 +85,12 @@ export function init(options: VercelEdgeOptions = {}): Client | undefined {
     const detectedRelease = getSentryRelease();
     if (detectedRelease !== undefined) {
       options.release = detectedRelease;
-    } else {
-      // If release is not provided, then we should disable autoSessionTracking
-      // eslint-disable-next-line deprecation/deprecation
-      options.autoSessionTracking = false;
     }
   }
 
   options.environment =
     options.environment || process.env.SENTRY_ENVIRONMENT || getVercelEnv(false) || process.env.NODE_ENV;
 
-  // eslint-disable-next-line deprecation/deprecation
-  if (options.autoSessionTracking === undefined && options.dsn !== undefined) {
-    // eslint-disable-next-line deprecation/deprecation
-    options.autoSessionTracking = true;
-  }
-
   const client = new VercelEdgeClient({
     ...options,
     stackParser: stackParserFromStackParserOptions(options.stackParser || nodeStackParser),
diff --git a/packages/vue/test/integration/VueIntegration.test.ts b/packages/vue/test/integration/VueIntegration.test.ts
