@senzops/apm-node 1.1.4 → 1.1.6

package/src/wrappers/next.ts

@@ -4,27 +4,49 @@ import { normalizePath } from '../core/normalizer';
 // --- App Router Wrapper ---
 export const wrapNextRoute = (handler: Function) => {
   return async (req: Request | any, context?: any) => {
+
+    // Extract info from Web Standard Request
     const url = req.url ? new URL(req.url) : { pathname: '/' };
     const method = req.method || 'GET';
-    const ua = req.headers.get ? req.headers.get('user-agent') : undefined;
-    const ip = req.headers.get ? req.headers.get('x-forwarded-for') : undefined;
+
+    // Header Extraction
+    let headers: Record<string, string> = {};
+    let ua: string | undefined;
+    let ip: string | undefined;
+
+    if (typeof req.headers.get === 'function') {
+      // It's a Web Request Object
+      ua = req.headers.get('user-agent');
+      ip = req.headers.get('x-forwarded-for');
+
+      // Convert to plain object for trace context extraction
+      req.headers.forEach((value: string, key: string) => {
+        headers[key] = value;
+      });
+    } else {
+      // It's a Node Request Object (rare in App router but possible)
+      headers = req.headers;
+      ua = headers['user-agent'];
+      ip = headers['x-forwarded-for'] as string;
+    }
 
     return client.startTrace({
       method,
       path: url.pathname,
       userAgent: ua,
-      ip: ip
+      ip: ip,
+      headers: headers // Pass extracted headers
     }, async () => {
       try {
         const response = await handler(req, context);
         const status = response?.status || 200;
+
         client.endTrace(status, { route: normalizePath(url.pathname) });
         return response;
       } catch (err: any) {
-        // AUTOMATIC ERROR CAPTURE
         client.captureError(err);
         client.endTrace(500, { route: normalizePath(url.pathname) });
-        throw err; // Re-throw so Next.js handles the error page
+        throw err;
       }
     });
   };
@@ -40,6 +62,7 @@ export const wrapNextPages = (handler: Function) => {
       path: path,
       userAgent: req.headers['user-agent'],
       ip: req.headers['x-forwarded-for'] || req.socket?.remoteAddress,
+      headers: req.headers // Standard Node headers work fine
     }, async () => {
 
       const done = () => {
@@ -52,10 +75,7 @@ export const wrapNextPages = (handler: Function) => {
       try {
         return await handler(req, res);
       } catch (e: any) {
-        // AUTOMATIC ERROR CAPTURE
         client.captureError(e);
-        // Note: In Pages dir, we rely on 'finish' listener above to close trace, 
-        // but capturing here ensures the error data is attached.
         throw e;
       }
     });