extract transaction name creation logic

Author: AbhiPrasad

packages/remix/src/utils/instrumentServer.ts

@@ -300,9 +300,8 @@ function matchServerRoutes(
  */
 export function startRequestHandlerTransaction(
   hub: Hub,
-  url: URL,
-  routes: ServerRoute[],
-  pkg: ReactRouterDomPkg | undefined,
+  name: string,
+  source: TransactionSource,
   request: {
     headers: {
       'sentry-trace': string;
@@ -315,11 +314,6 @@ export function startRequestHandlerTransaction(
   const traceparentData = extractTraceparentData(request.headers['sentry-trace']);
   const baggage = parseBaggageSetMutability(request.headers.baggage, traceparentData);
 
-  const matches = matchServerRoutes(routes, url.pathname, pkg);
-  const match = matches && getRequestMatch(url, matches);
-  const [name, source]: [string, TransactionSource] =
-    match === null ? [url.pathname, 'url'] : [match.route.id, 'route'];
-
   const transaction = hub.startTransaction({
     name,
     op: 'http.server',
@@ -338,6 +332,19 @@ export function startRequestHandlerTransaction(
   return transaction;
 }
 
+/**
+ * Get transaction name from routes and url
+ */
+export function getTransactionName(
+  routes: ServerRoute[],
+  url: URL,
+  pkg?: ReactRouterDomPkg,
+): [string, TransactionSource] {
+  const matches = matchServerRoutes(routes, url.pathname, pkg);
+  const match = matches && getRequestMatch(url, matches);
+  return match === null ? [url.pathname, 'url'] : [match.route.id, 'route'];
+}
+
 function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBuild): RequestHandler {
   const routes = createRoutes(build.routes);
   const pkg = loadModule<ReactRouterDomPkg>('react-router-dom');
@@ -352,7 +359,9 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
       }
 
       const url = new URL(request.url);
-      const transaction = startRequestHandlerTransaction(hub, url, routes, pkg, {
+      const [name, source] = getTransactionName(routes, url, pkg);
+
+      const transaction = startRequestHandlerTransaction(hub, name, source, {
         headers: {
           'sentry-trace': request.headers.get('sentry-trace') || '',
           baggage: request.headers.get('baggage') || '',

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

@@ -6,6 +6,7 @@ import { extractRequestData, isString, loadModule, logger } from '@sentry/utils'
 
 import {
   createRoutes,
+  getTransactionName,
   instrumentBuild,
   isRequestHandlerWrapped,
   startRequestHandlerTransaction,
@@ -51,7 +52,8 @@ function wrapExpressRequestHandler(
     }
 
     const url = new URL(request.url);
-    const transaction = startRequestHandlerTransaction(hub, url, routes, pkg, {
+    const [name, source] = getTransactionName(routes, url, pkg);
+    const transaction = startRequestHandlerTransaction(hub, name, source, {
       headers: {
         'sentry-trace': (req.headers && isString(req.headers['sentry-trace']) && req.headers['sentry-trace']) || '',
         baggage: (req.headers && isString(req.headers.baggage) && req.headers.baggage) || '',