refactor logic

Author: AbhiPrasad

packages/node/src/integrations/http.ts

@@ -1,6 +1,12 @@
 import type { Hub } from '@sentry/core';
 import { getCurrentHub, getDynamicSamplingContextFromClient } from '@sentry/core';
-import type { EventProcessor, Integration, SanitizedRequestData, TracePropagationTargets } from '@sentry/types';
+import type {
+  DynamicSamplingContext,
+  EventProcessor,
+  Integration,
+  SanitizedRequestData,
+  TracePropagationTargets,
+} from '@sentry/types';
 import {
   dynamicSamplingContextToSentryBaggageHeader,
   fill,
@@ -244,42 +250,15 @@ function _createWrappedRequestMethodFactory(
       if (shouldAttachTraceData(rawRequestUrl)) {
         if (requestSpan) {
           const sentryTraceHeader = requestSpan.toTraceparent();
-          __DEBUG_BUILD__ &&
-            logger.log(
-              `[Tracing] Adding sentry-trace header ${sentryTraceHeader} to outgoing request to "${requestUrl}": `,
-            );
           const dynamicSamplingContext = requestSpan?.transaction?.getDynamicSamplingContext();
-          const sentryBaggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
-          const sentryBaggageHeader = normalizeBaggageHeader(requestOptions, sentryBaggage);
-
-          requestOptions.headers = {
-            ...requestOptions.headers,
-            'sentry-trace': sentryTraceHeader,
-            // Setting a header to `undefined` will crash in node so we only set the baggage header when it's defined
-            ...(sentryBaggageHeader && { baggage: sentryBaggageHeader }),
-          };
+          addHeadersToRequestOptions(requestOptions, requestUrl, sentryTraceHeader, dynamicSamplingContext);
         } else {
+          const client = hub.getClient();
           const { traceId, sampled, dsc } = scope.getPropagationContext();
           const sentryTraceHeader = generateSentryTraceHeader(traceId, undefined, sampled);
-          __DEBUG_BUILD__ &&
-            logger.log(
-              `[Tracing] Adding sentry-trace header ${sentryTraceHeader} to outgoing request to "${requestUrl}": `,
-            );
-          requestOptions.headers = {
-            ...requestOptions.headers,
-            'sentry-trace': sentryTraceHeader,
-          };
-          const client = hub.getClient();
-          if (client) {
-            const dynamicSamplingContext = dsc || getDynamicSamplingContextFromClient(traceId, client, scope);
-            const sentryBaggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
-            const sentryBaggageHeader = normalizeBaggageHeader(requestOptions, sentryBaggage);
-            requestOptions.headers = {
-              ...requestOptions.headers,
-              // Setting a header to `undefined` will crash in node so we only set the baggage header when it's defined
-              ...(sentryBaggageHeader && { baggage: sentryBaggageHeader }),
-            };
-          }
+          const dynamicSamplingContext =
+            dsc || (client ? getDynamicSamplingContextFromClient(traceId, client, scope) : undefined);
+          addHeadersToRequestOptions(requestOptions, requestUrl, sentryTraceHeader, dynamicSamplingContext);
         }
       } else {
         __DEBUG_BUILD__ &&
@@ -322,6 +301,24 @@ function _createWrappedRequestMethodFactory(
   };
 }
 
+function addHeadersToRequestOptions(
+  requestOptions: RequestOptions,
+  requestUrl: string,
+  sentryTraceHeader: string,
+  dynamicSamplingContext: Partial<DynamicSamplingContext> | undefined,
+): void {
+  __DEBUG_BUILD__ &&
+    logger.log(`[Tracing] Adding sentry-trace header ${sentryTraceHeader} to outgoing request to "${requestUrl}": `);
+  const sentryBaggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
+  const sentryBaggageHeader = normalizeBaggageHeader(requestOptions, sentryBaggage);
+  requestOptions.headers = {
+    ...requestOptions.headers,
+    'sentry-trace': sentryTraceHeader,
+    // Setting a header to `undefined` will crash in node so we only set the baggage header when it's defined
+    ...(sentryBaggageHeader && { baggage: sentryBaggageHeader }),
+  };
+}
+
 function getRequestSpanData(requestUrl: string, requestOptions: RequestOptions): SanitizedRequestData {
   const method = requestOptions.method || 'GET';
   const data: SanitizedRequestData = {