Reduce duplication

Author: onurtemizkan

packages/remix/src/server/instrumentServer.ts

@@ -43,7 +43,11 @@ import { DEBUG_BUILD } from '../utils/debug-build';
 import { createRoutes, getTransactionName } from '../utils/utils';
 import { extractData, isResponse, json } from '../utils/vendor/response';
 import { captureRemixServerException, errorHandleDataFunction } from './errors';
-import { generateSentryServerTimingHeader, isCloudflareEnv } from './serverTimingTracePropagation';
+import {
+  generateSentryServerTimingHeader,
+  injectServerTimingHeaderValue,
+  isCloudflareEnv,
+} from './serverTimingTracePropagation';
 
 type AppData = unknown;
 type RemixRequest = Parameters<RequestHandler>[0];
@@ -60,37 +64,6 @@ function isCatchResponse(response: Response): boolean {
   return response.headers.get('X-Remix-Catch') != null;
 }
 
-/**
- * Injects Server-Timing header with Sentry trace context into a Response.
- */
-function injectServerTimingHeader(response: Response, precomputedHeader?: string | null): Response {
-  const serverTiming = precomputedHeader !== undefined ? precomputedHeader : generateSentryServerTimingHeader();
-
-  if (!serverTiming) {
-    return response;
-  }
-
-  if (response.bodyUsed) {
-    DEBUG_BUILD && debug.warn('Cannot inject Server-Timing header: response body already consumed');
-    return response;
-  }
-
-  try {
-    const headers = new Headers(response.headers);
-    const existingTiming = headers.get('Server-Timing');
-    headers.set('Server-Timing', existingTiming ? `${existingTiming}, ${serverTiming}` : serverTiming);
-
-    return new Response(response.body, {
-      status: response.status,
-      statusText: response.statusText,
-      headers,
-    });
-  } catch (e) {
-    DEBUG_BUILD && debug.warn('Failed to inject Server-Timing header into response', e);
-    return response;
-  }
-}
-
 /**
  * Sentry utility to be used in place of `handleError` function of Remix v2
  * Remix Docs: https://remix.run/docs/en/main/file-conventions/entry.server#handleerror
@@ -208,7 +181,7 @@ function makeWrappedDocumentRequestFunction(instrumentTracing?: boolean) {
       }
 
       if (serverTimingHeader && response instanceof Response) {
-        return injectServerTimingHeader(response, serverTimingHeader);
+        return injectServerTimingHeaderValue(response, serverTimingHeader);
       }
 
       return response;

packages/remix/src/server/serverTimingTracePropagation.ts

@@ -91,16 +91,11 @@ export function mergeSentryServerTimingHeader(
 }
 
 /**
- * Add Sentry trace context to Response headers via Server-Timing.
+ * Inject a precomputed Server-Timing header value into a Response.
  * Returns a new Response with the header added.
+ * @internal
  */
-export function addSentryServerTimingHeader(response: Response, options?: ServerTimingTraceOptions): Response {
-  const sentryTiming = generateSentryServerTimingHeader(options);
-
-  if (!sentryTiming) {
-    return response;
-  }
-
+export function injectServerTimingHeaderValue(response: Response, serverTimingValue: string): Response {
   if (response.bodyUsed) {
     DEBUG_BUILD && debug.warn('Cannot add Server-Timing header: response body already consumed');
     return response;
@@ -110,7 +105,7 @@ export function addSentryServerTimingHeader(response: Response, options?: Server
     const headers = new Headers(response.headers);
     const existing = headers.get('Server-Timing');
 
-    headers.set('Server-Timing', existing ? `${existing}, ${sentryTiming}` : sentryTiming);
+    headers.set('Server-Timing', existing ? `${existing}, ${serverTimingValue}` : serverTimingValue);
 
     return new Response(response.body, {
       status: response.status,
@@ -122,3 +117,17 @@ export function addSentryServerTimingHeader(response: Response, options?: Server
     return response;
   }
 }
+
+/**
+ * Add Sentry trace context to Response headers via Server-Timing.
+ * Returns a new Response with the header added.
+ */
+export function addSentryServerTimingHeader(response: Response, options?: ServerTimingTraceOptions): Response {
+  const sentryTiming = generateSentryServerTimingHeader(options);
+
+  if (!sentryTiming) {
+    return response;
+  }
+
+  return injectServerTimingHeaderValue(response, sentryTiming);
+}