More cleanup

Author: Luca Forstner

dev-packages/node-integration-tests/suites/sessions/server.ts

@@ -1,5 +1,4 @@
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
-import type { SessionFlusher } from '@sentry/core';
 import * as Sentry from '@sentry/node';
 
 Sentry.init({
@@ -13,14 +12,6 @@ import express from 'express';
 
 const app = express();
 
-// eslint-disable-next-line deprecation/deprecation
-const flusher = (Sentry.getClient() as Sentry.NodeClient)['_sessionFlusher'] as SessionFlusher;
-
-// Flush after 2 seconds (to avoid waiting for the default 60s)
-setTimeout(() => {
-  flusher?.flush();
-}, 2000);
-
 app.get('/test/success', (_req, res) => {
   res.send('Success!');
 });

packages/core/src/scope.ts

@@ -13,7 +13,6 @@ import type {
   Extras,
   Primitive,
   PropagationContext,
-  RequestSession,
   Scope as ScopeInterface,
   ScopeContext,
   ScopeData,
@@ -93,10 +92,6 @@ class ScopeClass implements ScopeInterface {
   /** Session */
   protected _session?: Session;
 
-  /** Request Mode Session Status */
-  // eslint-disable-next-line deprecation/deprecation
-  protected _requestSession?: RequestSession;
-
   /** The client on this scope */
   protected _client?: Client;
 
@@ -145,7 +140,6 @@ class ScopeClass implements ScopeInterface {
     newScope._transactionName = this._transactionName;
     newScope._fingerprint = this._fingerprint;
     newScope._eventProcessors = [...this._eventProcessors];
-    newScope._requestSession = this._requestSession;
     newScope._attachments = [...this._attachments];
     newScope._sdkProcessingMetadata = { ...this._sdkProcessingMetadata };
     newScope._propagationContext = { ...this._propagationContext };
@@ -228,23 +222,6 @@ class ScopeClass implements ScopeInterface {
     return this._user;
   }
 
-  /**
-   * @inheritDoc
-   */
-  // eslint-disable-next-line deprecation/deprecation
-  public getRequestSession(): RequestSession | undefined {
-    return this._requestSession;
-  }
-
-  /**
-   * @inheritDoc
-   */
-  // eslint-disable-next-line deprecation/deprecation
-  public setRequestSession(requestSession?: RequestSession): this {
-    this._requestSession = requestSession;
-    return this;
-  }
-
   /**
    * @inheritDoc
    */
@@ -359,13 +336,12 @@ class ScopeClass implements ScopeInterface {
 
     const scopeToMerge = typeof captureContext === 'function' ? captureContext(this) : captureContext;
 
-    const [scopeInstance, requestSession] =
+    const scopeInstance =
       scopeToMerge instanceof Scope
-        ? // eslint-disable-next-line deprecation/deprecation
-          [scopeToMerge.getScopeData(), scopeToMerge.getRequestSession()]
+        ? scopeToMerge.getScopeData()
         : isPlainObject(scopeToMerge)
-          ? [captureContext as ScopeContext, (captureContext as ScopeContext).requestSession]
-          : [];
+          ? (captureContext as ScopeContext)
+          : undefined;
 
     const { tags, extra, user, contexts, level, fingerprint = [], propagationContext } = scopeInstance || {};
 
@@ -389,10 +365,6 @@ class ScopeClass implements ScopeInterface {
       this._propagationContext = propagationContext;
     }
 
-    if (requestSession) {
-      this._requestSession = requestSession;
-    }
-
     return this;
   }
 
@@ -409,7 +381,6 @@ class ScopeClass implements ScopeInterface {
     this._level = undefined;
     this._transactionName = undefined;
     this._fingerprint = undefined;
-    this._requestSession = undefined;
     this._session = undefined;
     _setSpanForScope(this, undefined);
     this._attachments = [];

packages/core/src/types-hoist/scope.ts

@@ -6,7 +6,7 @@ import type { Event, EventHint } from './event';
 import type { EventProcessor } from './eventprocessor';
 import type { Extra, Extras } from './extra';
 import type { Primitive } from './misc';
-import type { RequestSession, Session } from './session';
+import type { Session } from './session';
 import type { SeverityLevel } from './severity';
 import type { Span } from './span';
 import type { PropagationContext } from './tracing';
@@ -23,8 +23,6 @@ export interface ScopeContext {
   contexts: Contexts;
   tags: { [key: string]: Primitive };
   fingerprint: string[];
-  // eslint-disable-next-line deprecation/deprecation
-  requestSession: RequestSession;
   propagationContext: PropagationContext;
 }
 
@@ -167,22 +165,6 @@ export interface Scope {
    */
   setSession(session?: Session): this;
 
-  /**
-   * Returns the `RequestSession` if there is one
-   *
-   * @deprecated Use `getSession()` and `setSession()` instead of `getRequestSession()` and `setRequestSession()`;
-   */
-  // eslint-disable-next-line deprecation/deprecation
-  getRequestSession(): RequestSession | undefined;
-
-  /**
-   * Sets the `RequestSession` on the scope
-   *
-   * @deprecated Use `getSession()` and `setSession()` instead of `getRequestSession()` and `setRequestSession()`;
-   */
-  // eslint-disable-next-line deprecation/deprecation
-  setRequestSession(requestSession?: RequestSession): this;
-
   /**
    * Updates the scope with provided data. Can work in three variations:
    * - plain object containing updatable attributes

packages/core/src/types-hoist/session.ts

@@ -1,13 +1,5 @@
 import type { User } from './user';
 
-/**
- * @deprecated This type is deprecated and will be removed in the next major version of the SDK.
- */
-export interface RequestSession {
-  // eslint-disable-next-line deprecation/deprecation
-  status?: RequestSessionStatus;
-}
-
 export interface Session {
   sid: string;
   did?: string | number;
@@ -40,11 +32,6 @@ export type SessionContext = Partial<Session>;
 
 export type SessionStatus = 'ok' | 'exited' | 'crashed' | 'abnormal';
 
-/**
- * @deprecated This type is deprecated and will be removed in the next major version of the SDK.
- */
-export type RequestSessionStatus = 'ok' | 'errored' | 'crashed';
-
 /** JSDoc */
 export interface SessionAggregates {
   attrs?: {

packages/core/src/utils/prepareEvent.ts

@@ -369,7 +369,6 @@ const captureContextKeys: readonly ScopeContextProperty[] = [
   'contexts',
   'tags',
   'fingerprint',
-  'requestSession',
   'propagationContext',
 ] as const;
 

packages/core/test/lib/prepareEvent.test.ts

@@ -162,7 +162,6 @@ describe('parseEventHintOrCaptureContext', () => {
       contexts: { os: { name: 'linux' } },
       tags: { foo: 'bar' },
       fingerprint: ['xx', 'yy'],
-      requestSession: { status: 'ok' },
       propagationContext: {
         traceId: 'xxx',
         spanId: 'yyy',
@@ -175,8 +174,8 @@ describe('parseEventHintOrCaptureContext', () => {
 
   it('triggers a TS error if trying to mix ScopeContext & EventHint', () => {
     const actual = parseEventHintOrCaptureContext({
-      // @ts-expect-error We are specifically testing that this errors!
       user: { id: 'xxx' },
+      // @ts-expect-error We are specifically testing that this errors!
       mechanism: { handled: false },
     });
 

packages/core/test/lib/scope.test.ts

@@ -6,7 +6,7 @@ import {
   withIsolationScope,
   withScope,
 } from '../../src';
-import type { Breadcrumb, Client, Event, RequestSessionStatus } from '../../src/types-hoist';
+import type { Breadcrumb, Client, Event } from '../../src/types-hoist';
 
 import { Scope } from '../../src/scope';
 import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
@@ -259,15 +259,6 @@ describe('Scope', () => {
       expect(parentScope['_extra']).toEqual(scope['_extra']);
     });
 
-    test('_requestSession clone', () => {
-      const parentScope = new Scope();
-      // eslint-disable-next-line deprecation/deprecation
-      parentScope.setRequestSession({ status: 'errored' });
-      const scope = parentScope.clone();
-      // eslint-disable-next-line deprecation/deprecation
-      expect(parentScope.getRequestSession()).toEqual(scope.getRequestSession());
-    });
-
     test('parent changed inheritance', () => {
       const parentScope = new Scope();
       const scope = parentScope.clone();
@@ -286,26 +277,6 @@ describe('Scope', () => {
       expect(scope['_extra']).toEqual({ a: 2 });
     });
 
-    test('child override should set the value of parent _requestSession', () => {
-      // Test that ensures if the status value of `status` of `_requestSession` is changed in a child scope
-      // that it should also change in parent scope because we are copying the reference to the object
-      const parentScope = new Scope();
-      // eslint-disable-next-line deprecation/deprecation
-      parentScope.setRequestSession({ status: 'errored' });
-
-      const scope = parentScope.clone();
-      // eslint-disable-next-line deprecation/deprecation
-      const requestSession = scope.getRequestSession();
-      if (requestSession) {
-        requestSession.status = 'ok';
-      }
-
-      // eslint-disable-next-line deprecation/deprecation
-      expect(parentScope.getRequestSession()).toEqual({ status: 'ok' });
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getRequestSession()).toEqual({ status: 'ok' });
-    });
-
     test('should clone propagation context', () => {
       const parentScope = new Scope();
       const scope = parentScope.clone();
@@ -322,12 +293,9 @@ describe('Scope', () => {
     scope.setUser({ id: '1' });
     scope.setFingerprint(['abcd']);
     scope.addBreadcrumb({ message: 'test' });
-    // eslint-disable-next-line deprecation/deprecation
-    scope.setRequestSession({ status: 'ok' });
     expect(scope['_extra']).toEqual({ a: 2 });
     scope.clear();
     expect(scope['_extra']).toEqual({});
-    expect(scope['_requestSession']).toEqual(undefined);
     expect(scope['_propagationContext']).toEqual({
       traceId: expect.any(String),
       spanId: expect.any(String),
@@ -356,8 +324,6 @@ describe('Scope', () => {
       scope.setUser({ id: '1337' });
       scope.setLevel('info');
       scope.setFingerprint(['foo']);
-      // eslint-disable-next-line deprecation/deprecation
-      scope.setRequestSession({ status: 'ok' });
     });
 
     test('given no data, returns the original scope', () => {
@@ -405,7 +371,6 @@ describe('Scope', () => {
       localScope.setUser({ id: '42' });
       localScope.setLevel('warning');
       localScope.setFingerprint(['bar']);
-      (localScope as any)._requestSession = { status: 'ok' };
 
       const updatedScope = scope.update(localScope) as any;
 
@@ -427,7 +392,6 @@ describe('Scope', () => {
       expect(updatedScope._user).toEqual({ id: '42' });
       expect(updatedScope._level).toEqual('warning');
       expect(updatedScope._fingerprint).toEqual(['bar']);
-      expect(updatedScope._requestSession.status).toEqual('ok');
       // @ts-expect-error accessing private property for test
       expect(updatedScope._propagationContext).toEqual(localScope._propagationContext);
     });
@@ -450,7 +414,6 @@ describe('Scope', () => {
       expect(updatedScope._user).toEqual({ id: '1337' });
       expect(updatedScope._level).toEqual('info');
       expect(updatedScope._fingerprint).toEqual(['foo']);
-      expect(updatedScope._requestSession.status).toEqual('ok');
     });
 
     test('given a plain object, it should merge two together, with the passed object having priority', () => {
@@ -461,8 +424,6 @@ describe('Scope', () => {
         level: 'warning' as const,
         tags: { bar: '3', baz: '4' },
         user: { id: '42' },
-        // eslint-disable-next-line deprecation/deprecation
-        requestSession: { status: 'errored' as RequestSessionStatus },
         propagationContext: {
           traceId: '8949daf83f4a4a70bee4c1eb9ab242ed',
           spanId: 'a024ad8fea82680e',
@@ -490,7 +451,6 @@ describe('Scope', () => {
       expect(updatedScope._user).toEqual({ id: '42' });
       expect(updatedScope._level).toEqual('warning');
       expect(updatedScope._fingerprint).toEqual(['bar']);
-      expect(updatedScope._requestSession).toEqual({ status: 'errored' });
       expect(updatedScope._propagationContext).toEqual({
         traceId: '8949daf83f4a4a70bee4c1eb9ab242ed',
         spanId: 'a024ad8fea82680e',

packages/node/src/utils/prepareEvent.ts

@@ -49,7 +49,6 @@ const captureContextKeys: readonly ScopeContextProperty[] = [
   'contexts',
   'tags',
   'fingerprint',
-  'requestSession',
   'propagationContext',
 ] as const;
 

packages/types/src/index.ts

@@ -115,8 +115,6 @@ import type {
   ReplayRecordingMode as ReplayRecordingMode_imported,
   Request as Request_imported,
   RequestEventData as RequestEventData_imported,
-  RequestSession as RequestSession_imported,
-  RequestSessionStatus as RequestSessionStatus_imported,
   Runtime as Runtime_imported,
   SamplingContext as SamplingContext_imported,
   SanitizedRequestData as SanitizedRequestData_imported,
@@ -422,12 +420,6 @@ export type SessionContext = SessionContext_imported;
 /** @deprecated This type has been moved to `@sentry/core`. */
 export type SessionStatus = SessionStatus_imported;
 /** @deprecated This type has been moved to `@sentry/core`. */
-// eslint-disable-next-line deprecation/deprecation
-export type RequestSession = RequestSession_imported;
-/** @deprecated This type has been moved to `@sentry/core`. */
-// eslint-disable-next-line deprecation/deprecation
-export type RequestSessionStatus = RequestSessionStatus_imported;
-/** @deprecated This type has been moved to `@sentry/core`. */
 export type SerializedSession = SerializedSession_imported;
 /** @deprecated This type has been moved to `@sentry/core`. */
 export type SeverityLevel = SeverityLevel_imported;