@lensmcp/nest-instrumentation 1.25.5 → 1.25.7

package/lib/context.d.ts

@@ -31,6 +31,12 @@ export interface LensmcpRequestContext {
     originNodeId?: string;
     /** W3C Trace Context header. */
     traceparent?: string;
+    /**
+     * This request's own id — unique even where `requestId` is not (a service that forwards one `x-request-id` to every
+     * call it makes). On its `server-request` event and on its SQL account (node-instrumentation's `db-request-account`),
+     * so the lens folds the account into the run it belongs to, not into whichever run shares the request id.
+     */
+    runId?: string;
     /**
      * Monotonic operation counters for this request, mutated in place.
      * Incremented by the zero-touch taps (@lensmcp/node-instrumentation: pg,

package/lib/trace-interceptor.js

@@ -1,3 +1,3 @@
-"use strict";var Y=Object.defineProperty;var u=(t,e)=>Y(t,"name",{value:e,configurable:!0});var Z=Object.defineProperty,a=u((t,e)=>Z(t,"name",{value:e,configurable:!0}),"d");import{__decorate as V}from"tslib";import{Injectable as ee}from"@nestjs/common";import{Observable as G}from"rxjs";import{catchError as te,tap as re}from"rxjs/operators";import{fingerprint as k,headlessFlowId as se,headlessFlowsEnabled as oe,isProbePath as ne,requestFacts as ae,responseFacts as ie,shapeOf as L,ulid as h}from"@lensmcp/core";import{activeMemoryOptions as de,onFlowStart as ue,onFlowSettled as ce}from"@lensmcp/memory-tracker";import{LENSMCP_CONTEXT_STORAGE as fe}from"./context.js";import{attachContextEnd as pe}from"./context-end.js";import{activeOptions as v}from"./state.js";let j=class{static{u(this,"C")}static{a(this,"TraceInterceptor")}intercept(t,e){const s=v();if(!s.trace.requests)return e.handle();const d=t.switchToHttp(),r=d.getRequest(),o=d.getResponse(),n=w(r.headers?.["x-request-id"])??h(),c=w(r.headers?.["x-lensmcp-flow-id"]),f=w(r.headers?.["x-internal-token"])!==void 0,l=c??(!f&&oe()&&!ne(r.url)?se(n):void 0),i={sessionId:s.sessionId,requestId:n,parentRequestId:w(r.headers?.["x-lensmcp-parent-request-id"]),flowId:l,originNodeId:w(r.headers?.["x-lensmcp-origin-node-id"]),traceparent:w(r.headers?.traceparent),dbCallCount:0},p=(r.method??"GET").toUpperCase(),m=r.route?.path??r.url??"<unknown>",b=t.getClass?.()?.name,N=t.getHandler?.()?.name,q=Date.now();l&&!c&&X(i,p,m,q);const O=s.memory.mode!=="off";O&&ue(n);const D=a(()=>{if(!O)return;const I=de()?.settleMs??1e3;setTimeout(()=>ce(n,i.flowId),I).unref?.()},"settleAndCheck"),K=pe(i);let C;typeof o?.once=="function"&&me()&&o.once("finish",()=>U(s.projectName,i,p,m,r,o,C));let M=!1,E=typeof o?.once!="function";const P=a(()=>{M&&E&&K()},"endIfOver");if(!E){const I=a(()=>{E=!0,P()},"responseOut");o.once?.("finish",I),o.once?.("close",I)}return new G(I=>{let A;return fe.run(i,()=>{A=e.handle().pipe(re({next:a(g=>{C??={value:g},I.next(g)},"next"),complete:a(()=>{x(s.projectName,i,p,m,o.statusCode??200,q),S(i,b,N,q,"ok"),D(),I.complete()},"complete")}),te(g=>{const F=g?.getResponse?.();F!==void 0&&(C??={value:F});const H=R(g);if(H!==void 0||typeof o.once!="function")x(s.projectName,i,p,m,H??T(o),q,g);else{let _=!1;const B=a(Q=>{if(_)return;_=!0;const W=Q&&o.statusCode&&o.statusCode>=400?o.statusCode:T(o);x(s.projectName,i,p,m,W,q,g)},"settle");o.once("finish",()=>B(!0)),o.once("close",()=>B(!1))}return S(i,b,N,q,"error"),D(),I.error(g),new G})).subscribe()}),()=>{A?.unsubscribe(),M=!0,P()}})}};j=V([ee()],j);export{j as TraceInterceptor};const $=new Map,le=6e4,me=a(()=>process.env.LENSMCP_HTTP_SHAPES!=="0","shapesOn");function U(t,e,s,d,r,o,n){try{const c=o.statusCode??200,f=`${s} ${d} ${Math.floor(c/100)}`,l=Date.now();if(l-($.get(f)??0)<le)return;$.set(f,l),$.size>2e3&&$.delete($.keys().next().value);const i=r.headers??{},p=r.body!==void 0&&r.body!==null&&typeof r.body=="object"&&!Buffer.isBuffer(r.body)?L(r.body):void 0,m=n&&n.value!==void 0&&typeof n.value=="object"&&n.value!==null&&!Buffer.isBuffer(n.value)&&typeof n.value.pipe!="function"?L(n.value):void 0,b={id:h(),sessionId:e.sessionId,timestamp:l,source:"nestjs",category:"backend",severity:"info",context:{sessionId:e.sessionId,flowId:e.flowId,requestId:e.requestId},fingerprint:k({kind:"http-exchange",identity:f}),title:`${s} ${d} \u2192 ${c} (its shape)`,raw:{kind:"http-exchange",method:s,route:d,status:c,request:{...ae(i,r.query,r.params),...p?{body:p}:{}},response:{...ie(o.getHeaders?.()??{},typeof i.origin=="string"?i.origin:void 0),...m?{body:m}:{}}}};y(b,t),v().emit(b)}catch{}}u(U,"fe"),a(U,"recordExchange");function R(t){const e=t;if(typeof e?.getStatus=="function")return e.getStatus();if(typeof e?.status=="number"&&e.status>=100)return e.status;if(typeof e?.statusCode=="number"&&e.statusCode>=100)return e.statusCode}u(R,"G"),a(R,"ownStatus");const Ie=new Set(["TypeError","ReferenceError","SyntaxError","RangeError","EvalError","URIError"]);export function requestOutcome(t,e){return e instanceof Error&&Ie.has(e.name)&&R(e)===void 0?"fault":t<400?"ok":t<500?"refused":t===500?"fault":"declared"}u(requestOutcome,"requestOutcome"),a(requestOutcome,"requestOutcome");function z(t){return t==="ok"?"info":t==="refused"?"warning":"error"}u(z,"pe"),a(z,"severityOf");function T(t){return t.statusCode&&t.statusCode>=400?t.statusCode:500}u(T,"L"),a(T,"inferStatus");function w(t){if(typeof t=="string")return t;if(Array.isArray(t)&&typeof t[0]=="string")return t[0]}u(w,"h"),a(w,"stringHeader");function X(t,e,s,d){const r=v(),o=`request:${e} ${s}`,n={id:h(),sessionId:t.sessionId,timestamp:d,source:"nestjs",category:"backend",severity:"info",context:{sessionId:t.sessionId,flowId:t.flowId,requestId:t.requestId,originType:"request",originNodeId:o},fingerprint:k({kind:"flow-origin",identity:`${e}:${s}`}),title:`${e} ${s}`,raw:{kind:"flow-origin",originNodeId:o,method:e,route:s}};y(n,r.projectName),r.emit(n)}u(X,"le"),a(X,"emitRequestOrigin");function S(t,e,s,d,r){if(!e||!s)return;const o=v(),n=Date.now()-d,c=`${e}.${s}`,f={id:h(),sessionId:t.sessionId,timestamp:Date.now(),source:"nestjs",category:"backend",severity:r==="error"?"error":"info",context:{sessionId:t.sessionId,flowId:t.flowId,requestId:t.requestId},fingerprint:k({kind:"method-call",identity:c}),title:`${c} (${n}ms)${r==="error"?" \u2717":""}`,raw:{kind:"span",span:{name:c,role:"controller",flowId:t.flowId,requestId:t.requestId,startTime:d,endTime:Date.now(),durationMs:n,status:r}}};y(f,v().projectName),o.emit(f)}u(S,"U"),a(S,"emitControllerSpan");function J(t){if(!(t instanceof Error))return{message:String(t)};const e=t.stack?t.stack.split(`
+"use strict";var Z=Object.defineProperty;var u=(t,e)=>Z(t,"name",{value:e,configurable:!0});var V=Object.defineProperty,a=u((t,e)=>V(t,"name",{value:e,configurable:!0}),"d");import{__decorate as ee}from"tslib";import{Injectable as te}from"@nestjs/common";import{Observable as L}from"rxjs";import{catchError as se,tap as re}from"rxjs/operators";import{fingerprint as k,headlessFlowId as oe,headlessFlowsEnabled as ne,isProbePath as ae,requestFacts as ie,responseFacts as de,shapeOf as U,ulid as h}from"@lensmcp/core";import{activeMemoryOptions as ue,onFlowStart as ce,onFlowSettled as fe}from"@lensmcp/memory-tracker";import{LENSMCP_CONTEXT_STORAGE as pe}from"./context.js";import{attachContextEnd as le}from"./context-end.js";import{activeOptions as v}from"./state.js";const me=Symbol.for("lensmcp.exchangeId");let j=class{static{u(this,"S")}static{a(this,"TraceInterceptor")}intercept(t,e){const r=v();if(!r.trace.requests)return e.handle();const d=t.switchToHttp(),s=d.getRequest(),o=d.getResponse(),n=y(s.headers?.["x-request-id"])??h(),c=y(s.headers?.["x-lensmcp-flow-id"]),f=y(s.headers?.["x-internal-token"])!==void 0,l=c??(!f&&ne()&&!ae(s.url)?oe(n):void 0),i={sessionId:r.sessionId,requestId:n,parentRequestId:y(s.headers?.["x-lensmcp-parent-request-id"]),flowId:l,originNodeId:y(s.headers?.["x-lensmcp-origin-node-id"]),traceparent:y(s.headers?.traceparent),runId:h(),dbCallCount:0},m=s[me],p=(s.method??"GET").toUpperCase(),I=s.route?.path??s.url??"<unknown>",N=t.getClass?.()?.name,O=t.getHandler?.()?.name,q=Date.now();l&&!c&&J(i,p,I,q);const D=r.memory.mode!=="off";D&&ce(n);const M=a(()=>{if(!D)return;const g=ue()?.settleMs??1e3;setTimeout(()=>fe(n,i.flowId),g).unref?.()},"settleAndCheck"),Q=le(i);let C;typeof o?.once=="function"&&ge()&&o.once("finish",()=>z(r.projectName,i,p,I,s,o,C));let P=!1,E=typeof o?.once!="function";const A=a(()=>{P&&E&&Q()},"endIfOver");if(!E){const g=a(()=>{E=!0,A()},"responseOut");o.once?.("finish",g),o.once?.("close",g)}return new L(g=>{let F;return pe.run(i,()=>{F=e.handle().pipe(re({next:a(w=>{C??={value:w},g.next(w)},"next"),complete:a(()=>{x(r.projectName,i,p,I,o.statusCode??200,q,void 0,m),T(i,N,O,q,"ok"),M(),g.complete()},"complete")}),se(w=>{const H=w?.getResponse?.();H!==void 0&&(C??={value:H});const _=R(w);if(_!==void 0||typeof o.once!="function")x(r.projectName,i,p,I,_??S(o),q,w,m);else{let B=!1;const G=a(W=>{if(B)return;B=!0;const Y=W&&o.statusCode&&o.statusCode>=400?o.statusCode:S(o);x(r.projectName,i,p,I,Y,q,w,m)},"settle");o.once("finish",()=>G(!0)),o.once("close",()=>G(!1))}return T(i,N,O,q,"error"),M(),g.error(w),new L})).subscribe()}),()=>{F?.unsubscribe(),P=!0,A()}})}};j=ee([te()],j);export{j as TraceInterceptor};const $=new Map,Ie=6e4,ge=a(()=>process.env.LENSMCP_HTTP_SHAPES!=="0","shapesOn");function z(t,e,r,d,s,o,n){try{const c=o.statusCode??200,f=`${r} ${d} ${Math.floor(c/100)}`,l=Date.now();if(l-($.get(f)??0)<Ie)return;$.set(f,l),$.size>2e3&&$.delete($.keys().next().value);const i=s.headers??{},m=s.body!==void 0&&s.body!==null&&typeof s.body=="object"&&!Buffer.isBuffer(s.body)?U(s.body):void 0,p=n&&n.value!==void 0&&typeof n.value=="object"&&n.value!==null&&!Buffer.isBuffer(n.value)&&typeof n.value.pipe!="function"?U(n.value):void 0,I={id:h(),sessionId:e.sessionId,timestamp:l,source:"nestjs",category:"backend",severity:"info",context:{sessionId:e.sessionId,flowId:e.flowId,requestId:e.requestId},fingerprint:k({kind:"http-exchange",identity:f}),title:`${r} ${d} \u2192 ${c} (its shape)`,raw:{kind:"http-exchange",method:r,route:d,status:c,request:{...ie(i,s.query,s.params),...m?{body:m}:{}},response:{...de(o.getHeaders?.()??{},typeof i.origin=="string"?i.origin:void 0),...p?{body:p}:{}}}};b(I,t),v().emit(I)}catch{}}u(z,"pe"),a(z,"recordExchange");function R(t){const e=t;if(typeof e?.getStatus=="function")return e.getStatus();if(typeof e?.status=="number"&&e.status>=100)return e.status;if(typeof e?.statusCode=="number"&&e.statusCode>=100)return e.statusCode}u(R,"L"),a(R,"ownStatus");const we=new Set(["TypeError","ReferenceError","SyntaxError","RangeError","EvalError","URIError"]);export function requestOutcome(t,e){return e instanceof Error&&we.has(e.name)&&R(e)===void 0?"fault":t<400?"ok":t<500?"refused":t===500?"fault":"declared"}u(requestOutcome,"requestOutcome"),a(requestOutcome,"requestOutcome");function X(t){return t==="ok"?"info":t==="refused"?"warning":"error"}u(X,"Ie"),a(X,"severityOf");function S(t){return t.statusCode&&t.statusCode>=400?t.statusCode:500}u(S,"U"),a(S,"inferStatus");function y(t){if(typeof t=="string")return t;if(Array.isArray(t)&&typeof t[0]=="string")return t[0]}u(y,"h"),a(y,"stringHeader");function J(t,e,r,d){const s=v(),o=`request:${e} ${r}`,n={id:h(),sessionId:t.sessionId,timestamp:d,source:"nestjs",category:"backend",severity:"info",context:{sessionId:t.sessionId,flowId:t.flowId,requestId:t.requestId,originType:"request",originNodeId:o},fingerprint:k({kind:"flow-origin",identity:`${e}:${r}`}),title:`${e} ${r}`,raw:{kind:"flow-origin",originNodeId:o,method:e,route:r}};b(n,s.projectName),s.emit(n)}u(J,"me"),a(J,"emitRequestOrigin");function T(t,e,r,d,s){if(!e||!r)return;const o=v(),n=Date.now()-d,c=`${e}.${r}`,f={id:h(),sessionId:t.sessionId,timestamp:Date.now(),source:"nestjs",category:"backend",severity:s==="error"?"error":"info",context:{sessionId:t.sessionId,flowId:t.flowId,requestId:t.requestId},fingerprint:k({kind:"method-call",identity:c}),title:`${c} (${n}ms)${s==="error"?" \u2717":""}`,raw:{kind:"span",span:{name:c,role:"controller",flowId:t.flowId,requestId:t.requestId,startTime:d,endTime:Date.now(),durationMs:n,status:s}}};b(f,v().projectName),o.emit(f)}u(T,"X"),a(T,"emitControllerSpan");function K(t){if(!(t instanceof Error))return{message:String(t)};const e=t.stack?t.stack.split(`
 `).slice(0,30).join(`
-`):void 0;return{...t.name?{name:t.name}:{},message:t.message,...e?{stack:e}:{}}}u(J,"me"),a(J,"errorDetail");function y(t,e){if(!e)return;const s=t.raw;s&&s.project===void 0&&(s.project=e)}u(y,"$"),a(y,"stampProject");function x(t,e,s,d,r,o,n){const c=v(),f=Date.now()-o,l=requestOutcome(r,n),i={id:h(),sessionId:e.sessionId,timestamp:Date.now(),source:"nestjs",category:"backend",severity:z(l),context:{sessionId:e.sessionId,flowId:e.flowId,requestId:e.requestId,...e.parentRequestId?{parentRequestId:e.parentRequestId}:{},originNodeId:e.originNodeId,traceparent:e.traceparent},fingerprint:k({kind:"server-request",identity:`${s}:${d}:${Math.floor(r/100)}xx`}),title:`${s} ${d} \u2192 ${r} (${f}ms)`,message:n instanceof Error?n.message:void 0,raw:{kind:"server-request",request:{method:s,route:d,status:r,outcome:l,durationMs:f,startedAt:o,endedAt:Date.now(),flowId:e.flowId,requestId:e.requestId,...e.parentRequestId?{parentRequestId:e.parentRequestId}:{},...n?{error:J(n)}:{}}}},p={...i,id:h(),raw:{kind:"span",span:{name:`nest.request ${s} ${d}`,traceId:e.traceparent,flowId:e.flowId,requestId:e.requestId,startTime:o,endTime:Date.now(),durationMs:f,status:l==="ok"?"ok":"error"}}};y(i,t),y(p,t),c.emit(i),c.emit(p)}u(x,"S"),a(x,"emitRequest");
+`):void 0;return{...t.name?{name:t.name}:{},message:t.message,...e?{stack:e}:{}}}u(K,"ye"),a(K,"errorDetail");function b(t,e){if(!e)return;const r=t.raw;r&&r.project===void 0&&(r.project=e)}u(b,"$"),a(b,"stampProject");function x(t,e,r,d,s,o,n,c){const f=v(),l=Date.now()-o,i=requestOutcome(s,n),m={id:h(),sessionId:e.sessionId,timestamp:Date.now(),source:"nestjs",category:"backend",severity:X(i),context:{sessionId:e.sessionId,flowId:e.flowId,requestId:e.requestId,...e.parentRequestId?{parentRequestId:e.parentRequestId}:{},originNodeId:e.originNodeId,traceparent:e.traceparent},fingerprint:k({kind:"server-request",identity:`${r}:${d}:${Math.floor(s/100)}xx`}),title:`${r} ${d} \u2192 ${s} (${l}ms)`,message:n instanceof Error?n.message:void 0,raw:{kind:"server-request",request:{method:r,route:d,status:s,outcome:i,durationMs:l,startedAt:o,endedAt:Date.now(),flowId:e.flowId,requestId:e.requestId,...e.parentRequestId?{parentRequestId:e.parentRequestId}:{},...typeof c=="string"?{exchangeId:c}:{},...e.runId?{runId:e.runId}:{},...n?{error:K(n)}:{}}}},p={...m,id:h(),raw:{kind:"span",span:{name:`nest.request ${r} ${d}`,traceId:e.traceparent,flowId:e.flowId,requestId:e.requestId,startTime:o,endTime:Date.now(),durationMs:l,status:i==="ok"?"ok":"error"}}};b(m,t),b(p,t),f.emit(m),f.emit(p)}u(x,"O"),a(x,"emitRequest");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lensmcp/nest-instrumentation",
-  "version": "1.25.5",
+  "version": "1.25.7",
   "type": "module",
   "main": "./index.js",
   "module": "./index.js",
@@ -14,9 +14,9 @@
     }
   },
   "dependencies": {
-    "@lensmcp/core": "1.25.5",
-    "@lensmcp/memory-tracker": "1.25.5",
-    "@lensmcp/protocol-types": "1.25.5",
+    "@lensmcp/core": "1.25.7",
+    "@lensmcp/memory-tracker": "1.25.7",
+    "@lensmcp/protocol-types": "1.25.7",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {