avoid unncessary function

Author: mydea

packages/core/src/index.ts

@@ -59,7 +59,6 @@ export {
   addIntegration,
   // eslint-disable-next-line deprecation/deprecation
   convertIntegrationFnToClass,
-  makeIntegrationFn,
 } from './integration';
 export { FunctionToString, InboundFilters, LinkedErrors } from './integrations';
 export { prepareEvent } from './utils/prepareEvent';

packages/core/src/integration.ts

@@ -5,7 +5,6 @@ import type {
   Integration,
   IntegrationClass,
   IntegrationFn,
-  IntegrationFnResult,
   Options,
 } from '@sentry/types';
 import { arrayify, logger } from '@sentry/utils';
@@ -165,15 +164,6 @@ function findIndex<T>(arr: T[], callback: (item: T) => boolean): number {
   return -1;
 }
 
-/**
- * Generate a full integration function from a simple function.
- * This will ensure to add the given name both to the function definition (as id),
- * as well as to the integration return value.
- */
-export function makeIntegrationFn<Fn extends IntegrationFn>(fn: Fn): Fn {
-  return fn;
-}
-
 /**
  * Convert a new integration function to the legacy class syntax.
  * In v8, we can remove this and instead export the integration functions directly.

packages/core/src/integrations/inboundfilters.ts

@@ -1,8 +1,8 @@
-import type { Client, Event, EventHint, Integration, StackFrame } from '@sentry/types';
+import type {  Event, IntegrationFn, StackFrame } from '@sentry/types';
 import { getEventDescription, logger, stringMatchesSomePattern } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { convertIntegrationFnToClass, makeIntegrationFn } from '../integration';
+import { convertIntegrationFnToClass } from '../integration';
 
 // "Script error." is hard coded into browsers for errors that it can't read.
 // this is the result of a script being pulled in from an external domain and CORS.
@@ -30,7 +30,7 @@ export interface InboundFiltersOptions {
 }
 
 const INTEGRATION_NAME = 'InboundFilters';
-const inboundFiltersIntegration = makeIntegrationFn((options: Partial<InboundFiltersOptions>) => {
+const inboundFiltersIntegration: IntegrationFn = (options: Partial<InboundFiltersOptions>) => {
   return {
     name: INTEGRATION_NAME,
     processEvent(event, _hint, client) {
@@ -39,7 +39,7 @@ const inboundFiltersIntegration = makeIntegrationFn((options: Partial<InboundFil
       return _shouldDropEvent(event, mergedOptions) ? null : event;
     },
   };
-});
+}
 
 /** Inbound filters configurable by the user */
 // eslint-disable-next-line deprecation/deprecation

packages/core/test/lib/integration.test.ts

@@ -7,7 +7,6 @@ import {
   convertIntegrationFnToClass,
   getIntegrationsToSetup,
   installedIntegrations,
-  makeIntegrationFn,
   setupIntegration,
 } from '../../src/integration';
 import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
@@ -655,75 +654,12 @@ describe('addIntegration', () => {
   });
 });
 
-describe('makeIntegrationFn', () => {
-  it('works with a minimal integration', () => {
-    const myIntegration = makeIntegrationFn(() => {
-      return {
-        name: 'testName'
-      };
-    });
-
-    const integration = myIntegration();
-    expect(integration).toEqual({
-      name: 'testName',
-    });
-
-    // @ts-expect-error This SHOULD error
-    myIntegration({});
-  });
-
-  it('works with integration options', () => {
-    const myIntegration = makeIntegrationFn((_options: { xxx: string }) => {
-      return {
-        name: 'testName'
-      };
-    });
-
-    const integration = myIntegration({ xxx: 'aa' });
-    expect(integration).toEqual({
-      name: 'testName',
-    });
-
-    // @ts-expect-error This SHOULD error
-    myIntegration();
-    // @ts-expect-error This SHOULD error
-    myIntegration({});
-  });
-
-  it('works with integration hooks', () => {
-    const setup = jest.fn();
-    const setupOnce = jest.fn();
-    const processEvent = jest.fn();
-    const preprocessEvent = jest.fn();
 
-    const myIntegration = makeIntegrationFn(() => {
-      return {
-        name: 'testName',
-        setup,
-        setupOnce,
-        processEvent,
-        preprocessEvent,
-      };
-    });
-
-    const integration = myIntegration();
-    expect(integration).toEqual({
-      name: 'testName',
-      setup,
-      setupOnce,
-      processEvent,
-      preprocessEvent,
-    });
-
-    // @ts-expect-error This SHOULD error
-    makeIntegrationFn('testName', () => ({ other: 'aha' }));
-  });
-});
 
 describe('convertIntegrationFnToClass', () => {
   /* eslint-disable deprecation/deprecation */
   it('works with a minimal integration', () => {
-    const integrationFn = makeIntegrationFn(() => ({ name: 'testName'}));
+    const integrationFn = () => ({ name: 'testName'});
 
     const IntegrationClass = convertIntegrationFnToClass('testName', integrationFn);
 
@@ -742,15 +678,15 @@ describe('convertIntegrationFnToClass', () => {
     const processEvent = jest.fn();
     const preprocessEvent = jest.fn();
 
-    const integrationFn = makeIntegrationFn( () => {
+    const integrationFn = () => {
       return {
         name: 'testName',
         setup,
         setupOnce,
         processEvent,
         preprocessEvent,
       };
-    });
+    };
 
     const IntegrationClass = convertIntegrationFnToClass('testName', integrationFn);