feat(v8/core): Move addTracingHeadersToFetchRequest and instrumentFetchRequest to core

Author: AbhiPrasad

packages/tracing-internal/src/common/fetch.ts renamed to packages/core/src/fetch.ts

@@ -1,23 +1,15 @@
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SPAN_STATUS_ERROR,
-  getClient,
-  getCurrentScope,
-  getDynamicSamplingContextFromClient,
-  getDynamicSamplingContextFromSpan,
-  getIsolationScope,
-  hasTracingEnabled,
-  setHttpStatus,
-  spanToTraceHeader,
-  startInactiveSpan,
-} from '@sentry/core';
 import type { Client, HandlerDataFetch, Scope, Span, SpanOrigin } from '@sentry/types';
 import {
   BAGGAGE_HEADER_NAME,
   dynamicSamplingContextToSentryBaggageHeader,
   generateSentryTraceHeader,
   isInstanceOf,
 } from '@sentry/utils';
+import { getClient, getCurrentScope, getIsolationScope } from './currentScopes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
+import { getDynamicSamplingContextFromClient, getDynamicSamplingContextFromSpan, setHttpStatus, SPAN_STATUS_ERROR, startInactiveSpan } from './tracing';
+import { hasTracingEnabled } from './utils/hasTracingEnabled';
+import { spanToTraceHeader } from './utils/spanUtils';
 
 type PolymorphicRequestHeaders =
   | Record<string, string | undefined>
@@ -110,7 +102,6 @@ export function instrumentFetchRequest(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options: { [key: string]: any } = handlerData.args[1];
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
     options.headers = addTracingHeadersToFetchRequest(request, client, scope, options, span);
   }
 

packages/core/src/index.ts

@@ -113,3 +113,4 @@ export { metrics } from './metrics/exports';
 export type { MetricData } from './metrics/exports';
 export { metricsDefault } from './metrics/exports-default';
 export { BrowserMetricsAggregator } from './metrics/browser-aggregator';
+export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './fetch';

packages/tracing-internal/src/browser/request.ts

@@ -10,6 +10,7 @@ import {
   spanToJSON,
   spanToTraceHeader,
   startInactiveSpan,
+  instrumentFetchRequest
 } from '@sentry/core';
 import type { HandlerDataXhr, SentryWrappedXMLHttpRequest, Span } from '@sentry/types';
 import {
@@ -23,7 +24,6 @@ import {
   stringMatchesSomePattern,
 } from '@sentry/utils';
 
-import { instrumentFetchRequest } from '../common/fetch';
 import { addPerformanceInstrumentationHandler } from './instrument';
 import { WINDOW } from './types';
 

packages/tracing-internal/src/index.ts

@@ -25,6 +25,4 @@ export {
   addLcpInstrumentationHandler,
 } from './browser';
 
-export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './common/fetch';
-
 export type { RequestInstrumentationOptions } from './browser';

packages/vercel-edge/package.json

@@ -29,7 +29,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/tracing": "8.0.0-alpha.2",
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2"

packages/vercel-edge/src/integrations/wintercg-fetch.ts

@@ -1,10 +1,10 @@
-import { instrumentFetchRequest } from '@sentry-internal/tracing';
 import {
   addBreadcrumb,
   convertIntegrationFnToClass,
   defineIntegration,
   getClient,
   isSentryRequestUrl,
+  instrumentFetchRequest
 } from '@sentry/core';
 import type {
   Client,

packages/vercel-edge/test/wintercg-fetch.test.ts

@@ -1,4 +1,3 @@
-import * as internalTracing from '@sentry-internal/tracing';
 import * as sentryCore from '@sentry/core';
 import type { HandlerDataFetch, Integration } from '@sentry/types';
 import * as sentryUtils from '@sentry/utils';
@@ -14,7 +13,7 @@ class FakeClient extends VercelEdgeClient {
 }
 
 const addFetchInstrumentationHandlerSpy = jest.spyOn(sentryUtils, 'addFetchInstrumentationHandler');
-const instrumentFetchRequestSpy = jest.spyOn(internalTracing, 'instrumentFetchRequest');
+const instrumentFetchRequestSpy = jest.spyOn(sentryCore, 'instrumentFetchRequest');
 const addBreadcrumbSpy = jest.spyOn(sentryCore, 'addBreadcrumb');
 
 describe('WinterCGFetch instrumentation', () => {