lalala get rid of stuff??

Author: mydea

packages/astro/src/index.server.ts

@@ -11,8 +11,6 @@ export {
   addBreadcrumb,
   addEventProcessor,
   addIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  addRequestDataToEvent,
   amqplibIntegration,
   anrIntegration,
   disableAnrDetectionForCallback,
@@ -38,8 +36,6 @@ export {
   endSession,
   expressErrorHandler,
   expressIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  extractRequestData,
   extraErrorDataIntegration,
   fastifyIntegration,
   flush,

packages/aws-serverless/src/index.ts

@@ -42,11 +42,7 @@ export {
   flush,
   close,
   getSentryRelease,
-  // eslint-disable-next-line deprecation/deprecation
-  addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
-  // eslint-disable-next-line deprecation/deprecation
-  extractRequestData,
   createGetModuleFromFilename,
   anrIntegration,
   disableAnrDetectionForCallback,

packages/bun/src/index.ts

@@ -64,11 +64,7 @@ export {
   flush,
   close,
   getSentryRelease,
-  // eslint-disable-next-line deprecation/deprecation
-  addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
-  // eslint-disable-next-line deprecation/deprecation
-  extractRequestData,
   createGetModuleFromFilename,
   anrIntegration,
   disableAnrDetectionForCallback,

packages/core/src/integrations/requestdata.ts

@@ -1,10 +1,6 @@
 import { defineIntegration } from '../integration';
 import type { IntegrationFn } from '../types-hoist';
-import {
-  type AddRequestDataToEventOptions,
-  addNormalizedRequestDataToEvent,
-  addRequestDataToEvent,
-} from '../utils-hoist/requestdata';
+import { type AddRequestDataToEventOptions, addNormalizedRequestDataToEvent } from '../utils-hoist/requestdata';
 
 export type RequestDataIntegrationOptions = {
   /**
@@ -79,27 +75,18 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
       // that's happened, it will be easier to add this logic in without worrying about unexpected side effects.)
 
       const { sdkProcessingMetadata = {} } = event;
-      const { request, normalizedRequest } = sdkProcessingMetadata;
+      const { normalizedRequest, ipAddress } = sdkProcessingMetadata;
 
       const addRequestDataOptions = convertReqDataIntegrationOptsToAddReqDataOpts(_options);
 
       // If this is set, it takes precedence over the plain request object
       if (normalizedRequest) {
-        // Some other data is not available in standard HTTP requests, but can sometimes be augmented by e.g. Express or Next.js
-        const ipAddress = request ? request.ip || (request.socket && request.socket.remoteAddress) : undefined;
-        const user = request ? request.user : undefined;
-
-        addNormalizedRequestDataToEvent(event, normalizedRequest, { ipAddress, user }, addRequestDataOptions);
-        return event;
-      }
-
-      // TODO(v9): Eventually we can remove this fallback branch and only rely on the normalizedRequest above
-      if (!request) {
+        // TODO: user???
+        addNormalizedRequestDataToEvent(event, normalizedRequest, { ipAddress }, addRequestDataOptions);
         return event;
       }
 
-      // eslint-disable-next-line deprecation/deprecation
-      return addRequestDataToEvent(event, request, addRequestDataOptions);
+      return event;
     },
   };
 }) satisfies IntegrationFn;
@@ -116,8 +103,6 @@ function convertReqDataIntegrationOptsToAddReqDataOpts(
   integrationOptions: Required<RequestDataIntegrationOptions>,
 ): AddRequestDataToEventOptions {
   const {
-    // eslint-disable-next-line deprecation/deprecation
-    transactionNamingScheme,
     include: { ip, user, ...requestOptions },
   } = integrationOptions;
 
@@ -148,7 +133,6 @@ function convertReqDataIntegrationOptsToAddReqDataOpts(
       ip,
       user: addReqDataUserOpt,
       request: requestIncludeKeys.length !== 0 ? requestIncludeKeys : undefined,
-      transaction: transactionNamingScheme,
     },
   };
 }

packages/core/src/scope.ts

@@ -5,13 +5,15 @@ import type {
   Client,
   Context,
   Contexts,
+  DynamicSamplingContext,
   Event,
   EventHint,
   EventProcessor,
   Extra,
   Extras,
   Primitive,
   PropagationContext,
+  RequestEventData,
   Session,
   SeverityLevel,
   Span,
@@ -58,6 +60,12 @@ export interface SdkProcessingMetadata {
   requestSession?: {
     status: 'ok' | 'errored' | 'crashed';
   };
+  normalizedRequest?: RequestEventData;
+  dynamicSamplingContext?: Partial<DynamicSamplingContext>;
+  capturedSpanScope?: Scope;
+  capturedSpanIsolationScope?: Scope;
+  spanCountBeforeProcessing?: number;
+  ipAddress?: string;
 }
 
 /**
@@ -537,10 +545,8 @@ export class Scope {
 
   /**
    * Add data which will be accessible during event processing but won't get sent to Sentry.
-   *
-   * TODO(v9): We should type this stricter, so that e.g. `normalizedRequest` is strictly typed.
    */
-  public setSDKProcessingMetadata(newData: { [key: string]: unknown }): this {
+  public setSDKProcessingMetadata(newData: SdkProcessingMetadata): this {
     this._sdkProcessingMetadata = merge(this._sdkProcessingMetadata, newData, 2);
     return this;
   }

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

@@ -1,15 +1,13 @@
-import type { CaptureContext, Scope } from '../scope';
+import type { CaptureContext, SdkProcessingMetadata } from '../scope';
 import type { Attachment } from './attachment';
 import type { Breadcrumb } from './breadcrumb';
 import type { Contexts } from './context';
 import type { DebugMeta } from './debugMeta';
-import type { DynamicSamplingContext } from './envelope';
 import type { Exception } from './exception';
 import type { Extras } from './extra';
 import type { Measurements } from './measurement';
 import type { Mechanism } from './mechanism';
 import type { Primitive } from './misc';
-import type { PolymorphicRequest } from './polymorphics';
 import type { RequestEventData } from './request';
 import type { SdkInfo } from './sdkinfo';
 import type { SeverityLevel } from './severity';
@@ -54,14 +52,7 @@ export interface Event {
   debug_meta?: DebugMeta;
   // A place to stash data which is needed at some point in the SDK's event processing pipeline but which shouldn't get sent to Sentry
   // Note: This is considered internal and is subject to change in minors
-  sdkProcessingMetadata?: { [key: string]: unknown } & {
-    request?: PolymorphicRequest;
-    normalizedRequest?: RequestEventData;
-    dynamicSamplingContext?: Partial<DynamicSamplingContext>;
-    capturedSpanScope?: Scope;
-    capturedSpanIsolationScope?: Scope;
-    spanCountBeforeProcessing?: number;
-  };
+  sdkProcessingMetadata?: SdkProcessingMetadata;
   transaction_info?: {
     source: TransactionSource;
   };

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

@@ -4,10 +4,10 @@
 export interface RequestEventData {
   url?: string;
   method?: string;
-  data?: any;
+  data?: unknown;
   query_string?: QueryParams;
-  cookies?: { [key: string]: string };
-  env?: { [key: string]: string };
+  cookies?: Record<string, string>;
+  env?: Record<string, string>;
   headers?: { [key: string]: string };
 }
 

packages/core/src/utils-hoist/index.ts

@@ -70,23 +70,13 @@ export type { PromiseBuffer } from './promisebuffer';
 export {
   DEFAULT_USER_INCLUDES,
   addNormalizedRequestDataToEvent,
-  // eslint-disable-next-line deprecation/deprecation
-  addRequestDataToEvent,
-  // eslint-disable-next-line deprecation/deprecation
-  extractPathForTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  extractRequestData,
   winterCGHeadersToDict,
   winterCGRequestToRequestData,
   httpRequestToRequestData,
   extractQueryParamsFromUrl,
   headersToDict,
 } from './requestdata';
-export type {
-  AddRequestDataToEventOptions,
-  // eslint-disable-next-line deprecation/deprecation
-  TransactionNamingScheme,
-} from './requestdata';
+export type { AddRequestDataToEventOptions } from './requestdata';
 
 export { severityLevelFromString } from './severity';
 export {