@senzops/apm-node 1.2.0 → 1.2.1

package/src/wrappers/h3.ts

@@ -1,6 +1,7 @@
-import { client } from '../core/client';
-import { getRoute } from '../core/normalizer';
-import { getClientIp } from '../utils/getClientIp';
+import { client } from '../core/client';
+import { getRoute } from '../core/normalizer';
+import { invokeWithFrameworkSpan } from '../instrumentation/framework';
+import { getClientIp } from '../utils/getClientIp';
 
 type EventHandler = (event: any) => any;
 
@@ -15,21 +16,44 @@ export const wrapH3 = (handler: EventHandler) => {
       ip: getClientIp(req),
       userAgent: req.headers['user-agent'],
       headers: req.headers // Pass headers
-    }, async () => {
-      try {
-        const response = await handler(event);
-        let status = 200;
-        if (event.node.res.statusCode) status = event.node.res.statusCode;
-        if (response && response.statusCode) status = response.statusCode;
-
-        client.endTrace(status, { route: getRoute(event, path) });
-        return response;
-      } catch (err: any) {
-        client.captureError(err);
-        const status = err.statusCode || err.status || 500;
+    }, async () => {
+      try {
+        const route = getRoute(event, path);
+        const response = await invokeWithFrameworkSpan(
+          handler,
+          undefined,
+          [event],
+          {
+            framework: 'h3',
+            type: 'event_handler',
+            name: `h3.event_handler ${req.method || 'GET'} ${route}`,
+            route,
+            method: req.method || 'GET',
+            request: req,
+            response: event.node.res,
+            attributes: {
+              'h3.type': 'event_handler',
+              'http.route': route
+            }
+          },
+          undefined,
+          {
+            callbackCompletesSpan: false,
+            responseEndsSpan: false
+          }
+        );
+        let status = 200;
+        if (event.node.res.statusCode) status = event.node.res.statusCode;
+        if (response && response.statusCode) status = response.statusCode;
+
+        client.endTrace(status, { route });
+        return response;
+      } catch (err: any) {
+        client.captureError(err);
+        const status = err.statusCode || err.status || 500;
         client.endTrace(status, { route: getRoute(event, path) });
         throw err;
       }
     });
   };
-};
+};

package/src/wrappers/next.ts

@@ -1,6 +1,7 @@
-import { client } from '../core/client';
-import { normalizePath } from '../core/normalizer';
-import { getClientIp } from '../utils/getClientIp';
+import { client } from '../core/client';
+import { normalizePath } from '../core/normalizer';
+import { invokeWithFrameworkSpan } from '../instrumentation/framework';
+import { getClientIp } from '../utils/getClientIp';
 
 // --- App Router Wrapper ---
 export const wrapNextRoute = (handler: Function) => {
@@ -37,16 +38,39 @@ export const wrapNextRoute = (handler: Function) => {
       userAgent: ua,
       ip: ip || getClientIp(req),
       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) {
-        client.captureError(err);
-        client.endTrace(500, { route: normalizePath(url.pathname) });
+    }, async () => {
+      try {
+        const route = normalizePath(url.pathname);
+        const response = await invokeWithFrameworkSpan(
+          handler,
+          undefined,
+          [req, context],
+          {
+            framework: 'next',
+            type: 'route_handler',
+            name: `next.app_route_handler ${method} ${route}`,
+            route,
+            method,
+            request: req,
+            attributes: {
+              'next.router': 'app',
+              'http.route': route,
+              'url.path': url.pathname
+            }
+          },
+          undefined,
+          {
+            callbackCompletesSpan: false,
+            responseEndsSpan: false
+          }
+        );
+        const status = response?.status || 200;
+
+        client.endTrace(status, { route });
+        return response;
+      } catch (err: any) {
+        client.captureError(err);
+        client.endTrace(500, { route: normalizePath(url.pathname) });
         throw err;
       }
     });
@@ -71,14 +95,37 @@ export const wrapNextPages = (handler: Function) => {
       };
 
       res.once('finish', done);
-      res.once('close', done);
-
-      try {
-        return await handler(req, res);
-      } catch (e: any) {
-        client.captureError(e);
-        throw e;
+      res.once('close', done);
+
+      try {
+        const route = normalizePath(path);
+        return await invokeWithFrameworkSpan(
+          handler,
+          undefined,
+          [req, res],
+          {
+            framework: 'next',
+            type: 'route_handler',
+            name: `next.pages_api_handler ${req.method || 'GET'} ${route}`,
+            route,
+            method: req.method || 'GET',
+            request: req,
+            response: res,
+            attributes: {
+              'next.router': 'pages',
+              'http.route': route
+            }
+          },
+          undefined,
+          {
+            callbackCompletesSpan: false,
+            responseEndsSpan: true
+          }
+        );
+      } catch (e: any) {
+        client.captureError(e);
+        throw e;
       }
     });
   };
-};
+};

package/wiki.md

@@ -82,6 +82,10 @@ Senzor.init({
   maxAttributes: 64,
   captureHeaders: false,
   captureDbStatement: true,
+  frameworkSpans: true,
+  captureMiddlewareSpans: true,
+  captureRouterSpans: true,
+  captureLifecycleHookSpans: true,
   autoLogs: true,
   debug: false
 });
@@ -133,6 +137,10 @@ SENZOR_MAX_QUEUE_SIZE=10000
 SENZOR_MAX_SPANS_PER_TRACE=500
 SENZOR_CAPTURE_HEADERS=false
 SENZOR_CAPTURE_DB_STATEMENT=true
+SENZOR_FRAMEWORK_SPANS=true
+SENZOR_CAPTURE_MIDDLEWARE_SPANS=true
+SENZOR_CAPTURE_ROUTER_SPANS=true
+SENZOR_CAPTURE_LIFECYCLE_HOOK_SPANS=true
 SENZOR_AUTO_LOGS=true
 SENZOR_DEBUG=false
 ```