Move out URL extraction logic.

Author: onurtemizkan

packages/remix/src/utils/instrumentServer.ts

@@ -1,23 +1,13 @@
 /* eslint-disable max-lines */
 import { captureException, getCurrentHub } from '@sentry/node';
 import { getActiveTransaction, hasTracingEnabled, Span } from '@sentry/tracing';
-import {
-  addExceptionMechanism,
-  CrossPlatformRequest,
-  extractRequestData,
-  fill,
-  isNodeEnv,
-  loadModule,
-  logger,
-  serializeBaggage,
-} from '@sentry/utils';
+import { addExceptionMechanism, fill, isNodeEnv, loadModule, logger, serializeBaggage } from '@sentry/utils';
 
 import {
   AppData,
   CreateRequestHandlerFunction,
   DataFunction,
   DataFunctionArgs,
-  ExpressRequest,
   HandleDocumentRequestFunction,
   ReactRouterDomPkg,
   RequestHandler,
@@ -294,20 +284,13 @@ function matchServerRoutes(
  * @param pkg
  */
 export function startRequestHandlerTransaction(
-  request: Request | ExpressRequest,
+  url: URL,
+  method: string,
   routes: ServerRoute[],
   pkg?: ReactRouterDomPkg,
 ): Span | undefined {
   const hub = getCurrentHub();
   const currentScope = hub.getScope();
-
-  const reqData = extractRequestData(request as CrossPlatformRequest);
-
-  if (!reqData.url) {
-    return;
-  }
-
-  const url = new URL(reqData.url);
   const matches = matchServerRoutes(routes, url.pathname, pkg);
 
   const match = matches && getRequestMatch(url, matches);
@@ -317,7 +300,7 @@ export function startRequestHandlerTransaction(
     name,
     op: 'http.server',
     tags: {
-      method: reqData.method,
+      method: method,
     },
     metadata: {
       source,
@@ -334,7 +317,9 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
   const routes = createRoutes(build.routes);
   const pkg = loadModule<ReactRouterDomPkg>('react-router-dom');
   return async function (this: unknown, request: Request, loadContext?: unknown): Promise<Response> {
-    const transaction = startRequestHandlerTransaction(request, routes, pkg);
+    const url = new URL(request.url);
+
+    const transaction = startRequestHandlerTransaction(url, request.method, routes, pkg);
 
     const res = (await origRequestHandler.call(this, request, loadContext)) as Response;
 

packages/remix/src/utils/serverAdapters/express.ts

@@ -1,4 +1,4 @@
-import { loadModule } from '@sentry/utils';
+import { extractRequestData, loadModule } from '@sentry/utils';
 
 import { createRoutes, instrumentBuild, startRequestHandlerTransaction } from '../instrumentServer';
 import {
@@ -25,7 +25,15 @@ function wrapExpressRequestHandler(
     res: ExpressResponse,
     next: ExpressNextFunction,
   ): Promise<void> {
-    const transaction = startRequestHandlerTransaction(req, routes, pkg);
+    const request = extractRequestData(req);
+
+    if (!request.url || !request.method) {
+      return origRequestHandler.call(this, req, res, next);
+    }
+
+    const url = new URL(request.url);
+
+    const transaction = startRequestHandlerTransaction(url, request.method, routes, pkg);
 
     await origRequestHandler.call(this, req, res, next);