refactor into private methods

Author: AbhiPrasad

packages/node/src/integrations/undici/index.ts

@@ -1,5 +1,4 @@
-import type { Hub } from '@sentry/core';
-import { getDynamicSamplingContextFromClient } from '@sentry/core';
+import { getCurrentHub, getDynamicSamplingContextFromClient } from '@sentry/core';
 import type { EventProcessor, Integration, Span } from '@sentry/types';
 import {
   dynamicRequire,
@@ -89,7 +88,7 @@ export class Undici implements Integration {
   /**
    * @inheritDoc
    */
-  public setupOnce(_addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(_addGlobalEventProcessor: (callback: EventProcessor) => void): void {
     // Requires Node 16+ to use the diagnostics_channel API.
     if (NODE_VERSION.major && NODE_VERSION.major < 16) {
       return;
@@ -107,161 +106,166 @@ export class Undici implements Integration {
       return;
     }
 
-    const shouldCreateSpan = (url: string): boolean => {
-      if (this._options.shouldCreateSpanForRequest === undefined) {
-        return true;
-      }
+    // https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/docs/api/DiagnosticsChannel.md
+    ds.subscribe(ChannelName.RequestCreate, this._onRequestCreate);
+    ds.subscribe(ChannelName.RequestEnd, this._onRequestEnd);
+    ds.subscribe(ChannelName.RequestError, this._onRequestError);
+  }
 
-      const cachedDecision = this._createSpanUrlMap.get(url);
-      if (cachedDecision !== undefined) {
-        return cachedDecision;
-      }
+  /** Helper that wraps shouldCreateSpanForRequest option */
+  private _shouldCreateSpan(url: string): boolean {
+    if (this._options.shouldCreateSpanForRequest === undefined) {
+      return true;
+    }
 
-      const decision = this._options.shouldCreateSpanForRequest(url);
-      this._createSpanUrlMap.set(url, decision);
-      return decision;
-    };
+    const cachedDecision = this._createSpanUrlMap.get(url);
+    if (cachedDecision !== undefined) {
+      return cachedDecision;
+    }
 
-    // https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/docs/api/DiagnosticsChannel.md
-    ds.subscribe(ChannelName.RequestCreate, message => {
-      const hub = getCurrentHub();
-      if (!hub.getIntegration(Undici)) {
-        return;
-      }
+    const decision = this._options.shouldCreateSpanForRequest(url);
+    this._createSpanUrlMap.set(url, decision);
+    return decision;
+  }
 
-      const { request } = message as RequestCreateMessage;
+  private _onRequestCreate = (message: unknown): void => {
+    const hub = getCurrentHub();
+    if (!hub.getIntegration(Undici)) {
+      return;
+    }
 
-      const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
+    const { request } = message as RequestCreateMessage;
 
-      if (isSentryRequest(stringUrl) || request.__sentry_span__ !== undefined) {
-        return;
-      }
+    const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
 
-      const client = hub.getClient<NodeClient>();
-      if (!client) {
-        return;
-      }
+    if (isSentryRequest(stringUrl) || request.__sentry_span__ !== undefined) {
+      return;
+    }
 
-      const clientOptions = client.getOptions();
-      const scope = hub.getScope();
+    const client = hub.getClient<NodeClient>();
+    if (!client) {
+      return;
+    }
 
-      const parentSpan = scope.getSpan();
+    const clientOptions = client.getOptions();
+    const scope = hub.getScope();
 
-      const span = shouldCreateSpan(stringUrl) ? createRequestSpan(parentSpan, request, stringUrl) : undefined;
-      if (span) {
-        request.__sentry_span__ = span;
+    const parentSpan = scope.getSpan();
+
+    const span = this._shouldCreateSpan(stringUrl) ? createRequestSpan(parentSpan, request, stringUrl) : undefined;
+    if (span) {
+      request.__sentry_span__ = span;
+    }
+
+    const shouldAttachTraceData = (url: string): boolean => {
+      if (clientOptions.tracePropagationTargets === undefined) {
+        return true;
       }
 
-      const shouldAttachTraceData = (url: string): boolean => {
-        if (clientOptions.tracePropagationTargets === undefined) {
-          return true;
-        }
-
-        const cachedDecision = this._headersUrlMap.get(url);
-        if (cachedDecision !== undefined) {
-          return cachedDecision;
-        }
-
-        const decision = stringMatchesSomePattern(url, clientOptions.tracePropagationTargets);
-        this._headersUrlMap.set(url, decision);
-        return decision;
-      };
-
-      if (shouldAttachTraceData(stringUrl)) {
-        if (span) {
-          const dynamicSamplingContext = span?.transaction?.getDynamicSamplingContext();
-          const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
-
-          setHeadersOnRequest(request, span.toTraceparent(), sentryBaggageHeader);
-        } else {
-          const { traceId, sampled, dsc } = scope.getPropagationContext();
-          const sentryTrace = generateSentryTraceHeader(traceId, undefined, sampled);
-          const dynamicSamplingContext = dsc || getDynamicSamplingContextFromClient(traceId, client, scope);
-          const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
-          setHeadersOnRequest(request, sentryTrace, sentryBaggageHeader);
-        }
+      const cachedDecision = this._headersUrlMap.get(url);
+      if (cachedDecision !== undefined) {
+        return cachedDecision;
       }
-    });
 
-    ds.subscribe(ChannelName.RequestEnd, message => {
-      const hub = getCurrentHub();
-      if (!hub.getIntegration(Undici)) {
-        return;
+      const decision = stringMatchesSomePattern(url, clientOptions.tracePropagationTargets);
+      this._headersUrlMap.set(url, decision);
+      return decision;
+    };
+
+    if (shouldAttachTraceData(stringUrl)) {
+      if (span) {
+        const dynamicSamplingContext = span?.transaction?.getDynamicSamplingContext();
+        const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
+
+        setHeadersOnRequest(request, span.toTraceparent(), sentryBaggageHeader);
+      } else {
+        const { traceId, sampled, dsc } = scope.getPropagationContext();
+        const sentryTrace = generateSentryTraceHeader(traceId, undefined, sampled);
+        const dynamicSamplingContext = dsc || getDynamicSamplingContextFromClient(traceId, client, scope);
+        const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
+        setHeadersOnRequest(request, sentryTrace, sentryBaggageHeader);
       }
+    }
+  };
 
-      const { request, response } = message as RequestEndMessage;
+  private _onRequestEnd = (message: unknown): void => {
+    const hub = getCurrentHub();
+    if (!hub.getIntegration(Undici)) {
+      return;
+    }
 
-      const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
+    const { request, response } = message as RequestEndMessage;
 
-      if (isSentryRequest(stringUrl)) {
-        return;
-      }
+    const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
 
-      const span = request.__sentry_span__;
-      if (span) {
-        span.setHttpStatus(response.statusCode);
-        span.finish();
-      }
+    if (isSentryRequest(stringUrl)) {
+      return;
+    }
 
-      if (this._options.breadcrumbs) {
-        hub.addBreadcrumb(
-          {
-            category: 'http',
-            data: {
-              method: request.method,
-              status_code: response.statusCode,
-              url: stringUrl,
-            },
-            type: 'http',
-          },
-          {
-            event: 'response',
-            request,
-            response,
+    const span = request.__sentry_span__;
+    if (span) {
+      span.setHttpStatus(response.statusCode);
+      span.finish();
+    }
+
+    if (this._options.breadcrumbs) {
+      hub.addBreadcrumb(
+        {
+          category: 'http',
+          data: {
+            method: request.method,
+            status_code: response.statusCode,
+            url: stringUrl,
           },
-        );
-      }
-    });
+          type: 'http',
+        },
+        {
+          event: 'response',
+          request,
+          response,
+        },
+      );
+    }
+  };
 
-    ds.subscribe(ChannelName.RequestError, message => {
-      const hub = getCurrentHub();
-      if (!hub.getIntegration(Undici)) {
-        return;
-      }
+  private _onRequestError = (message: unknown): void => {
+    const hub = getCurrentHub();
+    if (!hub.getIntegration(Undici)) {
+      return;
+    }
 
-      const { request } = message as RequestErrorMessage;
+    const { request } = message as RequestErrorMessage;
 
-      const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
+    const stringUrl = request.origin ? request.origin.toString() + request.path : request.path;
 
-      if (isSentryRequest(stringUrl)) {
-        return;
-      }
+    if (isSentryRequest(stringUrl)) {
+      return;
+    }
 
-      const span = request.__sentry_span__;
-      if (span) {
-        span.setStatus('internal_error');
-        span.finish();
-      }
+    const span = request.__sentry_span__;
+    if (span) {
+      span.setStatus('internal_error');
+      span.finish();
+    }
 
-      if (this._options.breadcrumbs) {
-        hub.addBreadcrumb(
-          {
-            category: 'http',
-            data: {
-              method: request.method,
-              url: stringUrl,
-            },
-            level: 'error',
-            type: 'http',
+    if (this._options.breadcrumbs) {
+      hub.addBreadcrumb(
+        {
+          category: 'http',
+          data: {
+            method: request.method,
+            url: stringUrl,
           },
-          {
-            event: 'error',
-            request,
-          },
-        );
-      }
-    });
-  }
+          level: 'error',
+          type: 'http',
+        },
+        {
+          event: 'error',
+          request,
+        },
+      );
+    }
+  };
 }
 
 function setHeadersOnRequest(