fix: Do not use wrap helper for req handler

library/sources/Express.tests.ts

@@ -137,13 +137,26 @@ export function createExpressTests(expressPackageName: string) {
 
     app.use(newRouter);
 
+    app.use("/", express.static(__dirname + "/fixtures/public/"));
+
     const nestedApp = express();
+    nestedApp.set("trust proxy", true);
     nestedApp.get("/", (req, res) => {
       res.send(getContext());
     });
 
     app.use("/nested-app", nestedApp);
 
+    const nestedNestedApp = express();
+    nestedNestedApp.get("/2", (req, res) => {
+      res.send(getContext());
+    });
+    nestedApp.use(nestedNestedApp);
+
+    nestedApp.get("/foo", (req, res) => {
+      res.send("bar");
+    });
+
     app.get("/", (req, res) => {
       const context = getContext();
 
@@ -608,6 +621,12 @@ export function createExpressTests(expressPackageName: string) {
     });
   });
 
+  t.test("it supports static files", async (t) => {
+    const response = await request(getApp()).get("/test.txt");
+
+    t.same(response.text, "Testfile");
+  });
+
   t.test("it supports nested app", async (t) => {
     const response = await request(getApp()).get("/nested-app");
 
@@ -616,6 +635,16 @@ export function createExpressTests(expressPackageName: string) {
       source: "express",
       route: "/nested-app",
     });
+
+    const response2 = await request(getApp()).get("/nested-app/foo");
+    t.same(response2.text, "bar");
+
+    const response3 = await request(getApp()).get("/nested-app/2");
+    t.match(response3.body, {
+      method: "GET",
+      source: "express",
+      route: "/nested-app/:number",
+    });
   });
 
   // Express instrumentation results in routes with no stack, crashing Ghost

library/sources/express/wrapRequestHandler.ts

@@ -1,23 +1,22 @@
 /* eslint-disable prefer-rest-params */
 import type { RequestHandler } from "express";
 import { runWithContext } from "../../agent/Context";
-import { createWrappedFunction } from "../../helpers/wrap";
 import { contextFromRequest } from "./contextFromRequest";
 
 export function wrapRequestHandler(handler: RequestHandler): RequestHandler {
-  const fn = createWrappedFunction(handler, function wrap(handler) {
-    return function wrap(this: RequestHandler) {
-      if (arguments.length === 0) {
-        return handler.apply(this);
-      }
+  const fn = function wrap(this: RequestHandler) {
+    if (arguments.length === 0) {
+      // @ts-expect-error Type of this
+      return handler.apply(this);
+    }
 
-      const context = contextFromRequest(arguments[0]);
+    const context = contextFromRequest(arguments[0]);
 
-      return runWithContext(context, () => {
-        return handler.apply(this, arguments);
-      });
-    };
-  }) as RequestHandler;
+    return runWithContext(context, () => {
+      // @ts-expect-error Type of arguments
+      return handler.apply(this, arguments);
+    });
+  };
 
   // Some libraries/apps have properties on the handler functions that are not copied by our createWrappedFunction function
   // (createWrappedFunction only copies properties when hasOwnProperty is true)

library/sources/fixtures/public/test.txt

@@ -0,0 +1 @@
+Testfile