feat(v8/serverless): Remove deprecated exports

Author: AbhiPrasad

packages/serverless/src/awslambda.ts

@@ -8,7 +8,6 @@ import {
   captureException,
   captureMessage,
   continueTrace,
-  defaultIntegrations as nodeDefaultIntegrations,
   flush,
   getCurrentScope,
   getDefaultIntegrations as getNodeDefaultIntegrations,
@@ -66,13 +65,6 @@ export interface WrapperOptions {
   startTrace: boolean;
 }
 
-/** @deprecated Use `getDefaultIntegrations(options)` instead. */
-export const defaultIntegrations: Integration[] = [
-  // eslint-disable-next-line deprecation/deprecation
-  ...nodeDefaultIntegrations,
-  awsServicesIntegration({ optional: true }),
-];
-
 /** Get the default integrations for the AWSLambda SDK. */
 export function getDefaultIntegrations(options: Options): Integration[] {
   return [...getNodeDefaultIntegrations(options), awsServicesIntegration({ optional: true })];

packages/serverless/src/awsservices.ts

@@ -1,6 +1,6 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
 import { getClient, startInactiveSpan } from '@sentry/node';
-import type { Client, Integration, IntegrationClass, IntegrationFn, Span } from '@sentry/types';
+import type { Client, IntegrationFn, Span } from '@sentry/types';
 import { fill } from '@sentry/utils';
 // 'aws-sdk/global' import is expected to be type-only so it's erased in the final .js file.
 // When TypeScript compiler is upgraded, use `import type` syntax to explicitly assert that we don't want to load a module here.
@@ -41,21 +41,10 @@ const _awsServicesIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const awsServicesIntegration = defineIntegration(_awsServicesIntegration);
-
 /**
  * AWS Service Request Tracking.
- *
- * @deprecated Use `awsServicesIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const AWSServices = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  awsServicesIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type AWSServices = typeof AWSServices;
+export const awsServicesIntegration = defineIntegration(_awsServicesIntegration);
 
 /**
  * Patches AWS SDK request to create `http.client` spans.

packages/serverless/src/gcpfunction/index.ts

@@ -1,10 +1,5 @@
 import type { NodeOptions } from '@sentry/node';
-import {
-  SDK_VERSION,
-  defaultIntegrations as defaultNodeIntegrations,
-  getDefaultIntegrations as getDefaultNodeIntegrations,
-  init as initNode,
-} from '@sentry/node';
+import { SDK_VERSION, getDefaultIntegrations as getDefaultNodeIntegrations, init as initNode } from '@sentry/node';
 import type { Integration, Options, SdkMetadata } from '@sentry/types';
 
 import { googleCloudGrpcIntegration } from '../google-cloud-grpc';
@@ -14,14 +9,6 @@ export * from './http';
 export * from './events';
 export * from './cloud_events';
 
-/** @deprecated Use `getDefaultIntegrations(options)` instead. */
-export const defaultIntegrations: Integration[] = [
-  // eslint-disable-next-line deprecation/deprecation
-  ...defaultNodeIntegrations,
-  googleCloudHttpIntegration({ optional: true }), // We mark this integration optional since '@google-cloud/common' module could be missing.
-  googleCloudGrpcIntegration({ optional: true }), // We mark this integration optional since 'google-gax' module could be missing.
-];
-
 /** Get the default integrations for the GCP SDK. */
 export function getDefaultIntegrations(options: Options): Integration[] {
   return [

packages/serverless/src/google-cloud-grpc.ts

@@ -1,12 +1,7 @@
 import type { EventEmitter } from 'events';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  convertIntegrationFnToClass,
-  defineIntegration,
-  getClient,
-} from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, getClient } from '@sentry/core';
 import { startInactiveSpan } from '@sentry/node';
-import type { Client, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import type { Client, IntegrationFn } from '@sentry/types';
 import { fill } from '@sentry/utils';
 
 interface GrpcFunction extends CallableFunction {
@@ -62,21 +57,10 @@ const _googleCloudGrpcIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const googleCloudGrpcIntegration = defineIntegration(_googleCloudGrpcIntegration);
-
 /**
  * Google Cloud Platform service requests tracking for GRPC APIs.
- *
- * @deprecated Use `googleCloudGrpcIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const GoogleCloudGrpc = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  googleCloudGrpcIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type GoogleCloudGrpc = typeof GoogleCloudGrpc;
+export const googleCloudGrpcIntegration = defineIntegration(_googleCloudGrpcIntegration);
 
 /** Returns a wrapped function that returns a stub with tracing enabled */
 function wrapCreateStub(origCreate: CreateStubFunc): CreateStubFunc {

packages/serverless/src/google-cloud-http.ts

@@ -1,12 +1,7 @@
 import type * as common from '@google-cloud/common';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  convertIntegrationFnToClass,
-  defineIntegration,
-  getClient,
-} from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, getClient } from '@sentry/core';
 import { startInactiveSpan } from '@sentry/node';
-import type { Client, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import type { Client, IntegrationFn } from '@sentry/types';
 import { fill } from '@sentry/utils';
 
 type RequestOptions = common.DecorateRequestOptions;
@@ -41,21 +36,10 @@ const _googleCloudHttpIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const googleCloudHttpIntegration = defineIntegration(_googleCloudHttpIntegration);
-
 /**
  * Google Cloud Platform service requests tracking for RESTful APIs.
- *
- * @deprecated Use `googleCloudHttpIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const GoogleCloudHttp = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  googleCloudHttpIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type GoogleCloudHttp = typeof GoogleCloudHttp;
+export const googleCloudHttpIntegration = defineIntegration(_googleCloudHttpIntegration);
 
 /** Returns a wrapped function that makes a request with tracing enabled */
 function wrapRequestFunction(orig: RequestFunction): RequestFunction {

packages/serverless/src/index.ts

@@ -1,10 +1,18 @@
-// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
-import * as AWSLambda from './awslambda';
-import * as GCPFunction from './gcpfunction';
-export { AWSLambda, GCPFunction };
+export { awsServicesIntegration } from './awsservices';
+
+import { init as awsLambdaInit, wrapHandler } from './awslambda';
+import { init as gcpFunctionInit } from './gcpfunction';
+
+const AWSLambda = {
+  init: awsLambdaInit,
+  wrapHandler,
+};
 
-// eslint-disable-next-line deprecation/deprecation
-export { AWSServices, awsServicesIntegration } from './awsservices';
+const GCPFunction = {
+  init: gcpFunctionInit,
+};
+
+export { AWSLambda, GCPFunction };
 
 // TODO(v8): We have to explicitly export these because of the namespace exports
 // above. This is because just doing `export * from '@sentry/node'` will not
@@ -15,8 +23,6 @@ export {
   SDK_VERSION,
   Scope,
   addBreadcrumb,
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addIntegration,
   autoDiscoverNodePerformanceMonitoringIntegrations,
@@ -25,61 +31,39 @@ export {
   captureMessage,
   captureCheckIn,
   withMonitor,
-  // eslint-disable-next-line deprecation/deprecation
-  configureScope,
   createTransport,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
   getHubFromCarrier,
-  // eslint-disable-next-line deprecation/deprecation
-  spanStatusfromHttpCode,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
   setCurrentClient,
   setContext,
   setExtra,
   setExtras,
   setTag,
   setTags,
   setUser,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   withScope,
   withIsolationScope,
   NodeClient,
   makeNodeTransport,
   close,
-  // eslint-disable-next-line deprecation/deprecation
-  defaultIntegrations,
   getDefaultIntegrations,
   defaultStackParser,
   flush,
   getSentryRelease,
   init,
-  // eslint-disable-next-line deprecation/deprecation
-  lastEventId,
   DEFAULT_USER_INCLUDES,
   addRequestDataToEvent,
   extractRequestData,
-  // eslint-disable-next-line deprecation/deprecation
-  deepReadDirSync,
   Handlers,
-  // eslint-disable-next-line deprecation/deprecation
-  Integrations,
   setMeasurement,
   getActiveSpan,
   startSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startInactiveSpan,
   startSpanManual,
   continueTrace,
@@ -88,12 +72,8 @@ export {
   linkedErrorsIntegration,
   inboundFiltersIntegration,
   functionToStringIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  getModuleFromFilename,
   createGetModuleFromFilename,
   metrics,
-  // eslint-disable-next-line deprecation/deprecation
-  extractTraceparentData,
   runWithAsyncContext,
   consoleIntegration,
   onUncaughtExceptionIntegration,