Undo stupid change and fix tests

Author: Luca Forstner

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

@@ -135,10 +135,6 @@ export function instrumentOutgoingRequests(_options?: Partial<RequestInstrumenta
 
   if (traceFetch) {
     addInstrumentationHandler('fetch', (handlerData: HandlerDataFetch) => {
-      if (!hasTracingEnabled()) {
-        return;
-      }
-
       const createdSpan = instrumentFetchRequest(handlerData, shouldCreateSpan, shouldAttachHeadersWithTargets, spans);
       if (enableHTTPTimings && createdSpan) {
         addHTTPTimings(createdSpan);

packages/tracing-internal/src/common/fetch.ts

@@ -1,4 +1,4 @@
-import { getCurrentHub, getDynamicSamplingContextFromClient } from '@sentry/core';
+import { getCurrentHub, getDynamicSamplingContextFromClient, hasTracingEnabled } from '@sentry/core';
 import type { Client, HandlerDataFetch, Scope, Span, SpanOrigin } from '@sentry/types';
 import {
   BAGGAGE_HEADER_NAME,
@@ -30,7 +30,7 @@ export function instrumentFetchRequest(
   spans: Record<string, Span>,
   spanOrigin: SpanOrigin = 'auto.http.browser',
 ): Span | undefined {
-  if (!handlerData.fetchData) {
+  if (!hasTracingEnabled() || !handlerData.fetchData) {
     return undefined;
   }
 

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

@@ -126,17 +126,6 @@ describe('callbacks', () => {
       },
     );
 
-    it('adds neither fetch request spans nor fetch request headers if there is no fetch data in handler data', () => {
-      const spans = {};
-
-      instrumentFetchRequest(fetchHandlerData, alwaysCreateSpan, alwaysAttachHeaders, spans);
-
-      expect(spans).toEqual({});
-
-      const headers = (fetchHandlerData.args[1].headers as Record<string, string>) || {};
-      expect(Object.keys(headers)).toEqual([]);
-    });
-
     it('adds neither fetch request spans nor fetch request headers if tracing is disabled', () => {
       hasTracingEnabled.mockReturnValueOnce(false);
       const spans = {};