Check for '__sentry_fastify_wrapped__' prop in 'instrumentServer' mod

Author: rustworthy

packages/remix/src/utils/instrumentServer.ts

@@ -244,7 +244,8 @@ function makeWrappedDataFunction(
   manuallyInstrumented: boolean,
 ): DataFunction {
   return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
-    if (args.context.__sentry_express_wrapped__ && !manuallyInstrumented) {
+    const alreadyWrapped = args.context.__sentry_express_wrapped__ || args.context.__sentry_fastify_wrapped__;
+    if (alreadyWrapped && !manuallyInstrumented) {
       return origFn.call(this, args);
     }
 
@@ -424,9 +425,9 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
   const routes = createRoutes(build.routes);
 
   return async function (this: unknown, request: RemixRequest, loadContext?: AppLoadContext): Promise<Response> {
-    // This means that the request handler of the adapter (ex: express) is already wrapped.
+    // This means that the request handler of the adapter (ex: express or fastify) is already wrapped.
     // So we don't want to double wrap it.
-    if (loadContext?.__sentry_express_wrapped__) {
+    if (loadContext?.__sentry_express_wrapped__ || loadContext?.__sentry_fastify_wrapped__) {
       return origRequestHandler.call(this, request, loadContext);
     }
 

packages/remix/src/utils/vendor/types.ts

@@ -65,7 +65,10 @@ export type RemixRequest = Request &
     agent: Agent | ((parsedURL: URL) => Agent) | undefined;
   };
 
-export type AppLoadContext = Record<string, unknown> & { __sentry_express_wrapped__?: boolean };
+export type AppLoadContext = Record<string, unknown> & {
+  __sentry_express_wrapped__?: boolean;
+  __sentry_fastify_wrapped__?: boolean;
+};
 export type AppData = any;
 export type RequestHandler = (request: RemixRequest, loadContext?: AppLoadContext) => Promise<Response>;
 export type CreateRequestHandlerFunction = (this: unknown, build: ServerBuild, ...args: any[]) => RequestHandler;