Fix up imports in tests

Author: Luca Forstner

packages/core/src/index.ts

@@ -2,6 +2,7 @@ export type { ClientClass } from './sdk';
 export type { AsyncContextStrategy, Carrier, Layer, RunWithAsyncContextOptions } from './hub';
 export type { OfflineStore, OfflineTransportOptions } from './transports/offline';
 export type { ServerRuntimeClientOptions } from './server-runtime-client';
+export type { RequestDataIntegrationOptions } from './integrations/requestdata';
 
 export * from './tracing';
 export { createEventEnvelope } from './envelope';

packages/node/test/integrations/requestdata.test.ts

@@ -1,15 +1,14 @@
-import { getCurrentHub, Hub, makeMain } from '@sentry/core';
+import type { RequestDataIntegrationOptions } from '@sentry/core';
+import { getCurrentHub, Hub, makeMain, RequestData } from '@sentry/core';
 import type { Event, EventProcessor, PolymorphicRequest } from '@sentry/types';
+import * as sentryUtils from '@sentry/utils';
 import * as http from 'http';
 
 import { NodeClient } from '../../src/client';
 import { requestHandler } from '../../src/handlers';
-import type { RequestDataIntegrationOptions } from '../../src/integrations/requestdata';
-import { RequestData } from '../../src/integrations/requestdata';
-import * as requestDataModule from '../../src/requestdata';
 import { getDefaultNodeClientOptions } from '../helper/node-client-options';
 
-const addRequestDataToEventSpy = jest.spyOn(requestDataModule, 'addRequestDataToEvent');
+const addRequestDataToEventSpy = jest.spyOn(sentryUtils, 'addRequestDataToEvent');
 const requestDataEventProcessor = jest.fn();
 
 const headers = { ears: 'furry', nose: 'wet', tongue: 'spotted', cookie: 'favorite=zukes' };

packages/node/test/requestdata.test.ts

@@ -3,14 +3,14 @@
 // TODO (v8 / #5257): Remove everything related to the deprecated functions
 
 import type { Event, PolymorphicRequest, TransactionSource, User } from '@sentry/types';
-import type * as net from 'net';
-
-import type { AddRequestDataToEventOptions } from '../src/requestdata';
+import type { AddRequestDataToEventOptions } from '@sentry/utils';
 import {
   addRequestDataToEvent,
   extractPathForTransaction,
   extractRequestData as newExtractRequestData,
-} from '../src/requestdata';
+} from '@sentry/utils';
+import type * as net from 'net';
+
 import type { ExpressRequest } from '../src/requestDataDeprecated';
 import { extractRequestData as oldExtractRequestData, parseRequest } from '../src/requestDataDeprecated';