@frontmcp/observability 1.9.1 → 1.9.3

package/index.js

@@ -399,8 +399,8 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // libs/observability/src/plugin/observability.plugin.ts
-var import_api16 = require("@opentelemetry/api");
-var import_sdk2 = require("@frontmcp/sdk");
+var import_api17 = require("@opentelemetry/api");
+var import_sdk4 = require("@frontmcp/sdk");
 
 // libs/observability/src/logging/sinks/stdout.sink.ts
 function defaultStream() {
@@ -763,6 +763,13 @@ var RequestLogCollector = class {
     this.status = status;
     this.statusCode = statusCode;
   }
+  /**
+   * Set the HTTP status the request was answered with; one of 400 or more marks it failed.
+   */
+  setStatusCode(statusCode) {
+    this.statusCode = statusCode;
+    if (statusCode >= 400) this.status = "error";
+  }
   /**
    * Set error details.
    */
@@ -831,11 +838,13 @@ var RequestLogCollector = class {
   }
 };
 
-// libs/observability/src/request-log/request-log.tokens.ts
-var REQUEST_LOG_COLLECTOR = /* @__PURE__ */ Symbol.for("frontmcp:observability:request-log-collector");
+// libs/observability/src/request-log/request-log.hooks.ts
+var import_sdk3 = require("@frontmcp/sdk");
 
-// libs/observability/src/telemetry/telemetry.accessor.ts
-var import_api14 = require("@opentelemetry/api");
+// libs/observability/src/plugin/observability.hooks.ts
+var import_api13 = require("@opentelemetry/api");
+var import_sdk2 = require("@frontmcp/sdk");
+var import_utils = require("@frontmcp/utils");
 
 // libs/observability/src/otel/otel.types.ts
 var McpAttributes = {
@@ -950,60 +959,31 @@ var EnduserAttributes = {
   SCOPE: "enduser.scope"
 };
 
-// libs/observability/src/otel/trace-context-bridge.ts
-var import_api = require("@opentelemetry/api");
-function frontmcpToOTelSpanContext(tc) {
-  return {
-    traceId: tc.traceId,
-    spanId: tc.parentId,
-    traceFlags: tc.traceFlags & import_api.TraceFlags.SAMPLED ? import_api.TraceFlags.SAMPLED : import_api.TraceFlags.NONE,
-    isRemote: true
-  };
-}
-function otelToFrontmcpContext(sc) {
-  const flags = sc.traceFlags.toString(16).padStart(2, "0");
-  return {
-    traceId: sc.traceId,
-    parentId: sc.spanId,
-    traceFlags: sc.traceFlags,
-    raw: `00-${sc.traceId}-${sc.spanId}-${flags}`
-  };
-}
-function createOTelContextFromTrace(tc) {
-  const spanContext = frontmcpToOTelSpanContext(tc);
-  const span = import_api.trace.wrapSpanContext(spanContext);
-  return import_api.trace.setSpan(import_api.context.active(), span);
-}
-
-// libs/observability/src/plugin/observability.hooks.ts
-var import_api12 = require("@opentelemetry/api");
-var import_utils = require("@frontmcp/utils");
-
 // libs/observability/src/otel/spans/auth.span.ts
-var import_api3 = require("@opentelemetry/api");
+var import_api2 = require("@opentelemetry/api");
 
 // libs/observability/src/otel/spans/span.utils.ts
-var import_api2 = require("@opentelemetry/api");
+var import_api = require("@opentelemetry/api");
 function startSpan(tracer, options) {
-  const parentCtx = options.parentContext ?? import_api2.context.active();
+  const parentCtx = options.parentContext ?? import_api.context.active();
   const span = tracer.startSpan(
     options.name,
     {
-      kind: options.kind ?? import_api2.SpanKind.INTERNAL,
+      kind: options.kind ?? import_api.SpanKind.INTERNAL,
       attributes: options.attributes
     },
     parentCtx
   );
-  const spanContext = import_api2.trace.setSpan(parentCtx, span);
+  const spanContext = import_api.trace.setSpan(parentCtx, span);
   return { span, context: spanContext };
 }
 function endSpanOk(span) {
-  span.setStatus({ code: import_api2.SpanStatusCode.OK });
+  span.setStatus({ code: import_api.SpanStatusCode.OK });
   span.end();
 }
 function endSpanError(span, error) {
   const message = typeof error === "string" ? error : error.message;
-  span.setStatus({ code: import_api2.SpanStatusCode.ERROR, message });
+  span.setStatus({ code: import_api.SpanStatusCode.ERROR, message });
   if (error instanceof Error) {
     span.recordException(error);
   }
@@ -1011,7 +991,7 @@ function endSpanError(span, error) {
 }
 async function withSpan(tracer, options, fn) {
   const { span, context: spanContext } = startSpan(tracer, options);
-  return import_api2.context.with(spanContext, async () => {
+  return import_api.context.with(spanContext, async () => {
     try {
       const result = await fn(span);
       endSpanOk(span);
@@ -1027,7 +1007,7 @@ async function withSpan(tracer, options, fn) {
 function startAuthSpan(tracer, options) {
   return startSpan(tracer, {
     name: `auth ${options.flowName}`,
-    kind: import_api3.SpanKind.INTERNAL,
+    kind: import_api2.SpanKind.INTERNAL,
     attributes: {
       [FrontMcpAttributes.FLOW_NAME]: options.flowName
     },
@@ -1042,11 +1022,11 @@ function setAuthResult(span, result) {
 }
 
 // libs/observability/src/otel/spans/fetch.span.ts
-var import_api4 = require("@opentelemetry/api");
+var import_api3 = require("@opentelemetry/api");
 function startFetchSpan(tracer, options) {
   return startSpan(tracer, {
     name: options.method.toUpperCase(),
-    kind: import_api4.SpanKind.CLIENT,
+    kind: import_api3.SpanKind.CLIENT,
     attributes: {
       [HttpAttributes.METHOD]: options.method.toUpperCase(),
       [HttpAttributes.URL_FULL]: options.url
@@ -1058,6 +1038,33 @@ function setFetchResponseStatus(span, statusCode) {
   span.setAttribute(HttpAttributes.STATUS_CODE, statusCode);
 }
 
+// libs/observability/src/otel/spans/hook.span.ts
+var import_api4 = require("@opentelemetry/api");
+function recordHookEvent(parentSpan, stage, owner) {
+  const attributes = {};
+  if (owner) {
+    attributes[FrontMcpAttributes.HOOK_OWNER] = owner;
+  }
+  parentSpan.addEvent(`hook.${stage}`, attributes);
+}
+function startHookSpan(tracer, options) {
+  const attributes = {
+    [FrontMcpAttributes.HOOK_STAGE]: options.stage
+  };
+  if (options.owner) {
+    attributes[FrontMcpAttributes.HOOK_OWNER] = options.owner;
+  }
+  if (options.flowName) {
+    attributes[FrontMcpAttributes.FLOW_NAME] = options.flowName;
+  }
+  return startSpan(tracer, {
+    name: `hook ${options.stage}`,
+    kind: import_api4.SpanKind.INTERNAL,
+    attributes,
+    parentContext: options.parentContext
+  });
+}
+
 // libs/observability/src/otel/spans/http-server.span.ts
 var import_api5 = require("@opentelemetry/api");
 function startHttpServerSpan(tracer, options) {
@@ -1226,6 +1233,31 @@ function setTransportRequestType(span, requestType) {
   span.setAttribute(FrontMcpAttributes.TRANSPORT_REQUEST_TYPE, requestType);
 }
 
+// libs/observability/src/otel/trace-context-bridge.ts
+var import_api12 = require("@opentelemetry/api");
+function frontmcpToOTelSpanContext(tc) {
+  return {
+    traceId: tc.traceId,
+    spanId: tc.parentId,
+    traceFlags: tc.traceFlags & import_api12.TraceFlags.SAMPLED ? import_api12.TraceFlags.SAMPLED : import_api12.TraceFlags.NONE,
+    isRemote: true
+  };
+}
+function otelToFrontmcpContext(sc) {
+  const flags = sc.traceFlags.toString(16).padStart(2, "0");
+  return {
+    traceId: sc.traceId,
+    parentId: sc.spanId,
+    traceFlags: sc.traceFlags,
+    raw: `00-${sc.traceId}-${sc.spanId}-${flags}`
+  };
+}
+function createOTelContextFromTrace(tc) {
+  const spanContext = frontmcpToOTelSpanContext(tc);
+  const span = import_api12.trace.wrapSpanContext(spanContext);
+  return import_api12.trace.setSpan(import_api12.context.active(), span);
+}
+
 // libs/observability/src/plugin/observability.hooks.ts
 var SPAN_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:span");
 var SPAN_CTX_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:span-ctx");
@@ -1233,11 +1265,13 @@ var EXEC_SPAN_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:exec-span");
 var ACTIVE_SPAN_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:active-span");
 var ACTIVE_OTEL_CTX_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:active-otel-ctx");
 var STAGE_TS_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:stage-ts");
+var STAGE_EVENTS_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:stage-events");
+var HTTP_SPAN_CTX_KEY = /* @__PURE__ */ Symbol.for("frontmcp:otel:http-span-ctx");
 function sessionTracingId(sessionId) {
   return (0, import_utils.sha256Hex)(sessionId).slice(0, 16);
 }
 function getTracer() {
-  return import_api12.trace.getTracer("@frontmcp/observability");
+  return import_api13.trace.getTracer("@frontmcp/observability");
 }
 function extractContext(flowCtx) {
   try {
@@ -1267,7 +1301,44 @@ function clearActiveSpan(flowCtx) {
   } catch {
   }
 }
+function beginFlowSpan(flowCtx, options, span, spanCtx) {
+  flowCtx.state[SPAN_KEY] = span;
+  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
+  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  flowCtx.state[STAGE_EVENTS_KEY] = options.flowStageEvents !== false;
+}
+function parentContextOf(ctx) {
+  return ctx.get?.(HTTP_SPAN_CTX_KEY) ?? createOTelContextFromTrace(ctx.traceContext);
+}
+function flowFailureOf(flowError) {
+  const failed = flowError?.originalError;
+  const error = flowError instanceof import_sdk2.FlowControl ? failed instanceof Error ? failed : new import_sdk2.InternalMcpError(`Flow ended with: ${flowError.type}`) : flowError instanceof Error ? flowError : new Error(String(flowError));
+  const reported = (0, import_sdk2.toMcpError)(error);
+  return {
+    error,
+    type: reported.name,
+    message: reported.getPublicMessage(),
+    code: reported.code,
+    errorId: reported.errorId
+  };
+}
+function endFailedSpan(span, flowError) {
+  const failure = flowFailureOf(flowError);
+  span.setStatus({ code: import_api13.SpanStatusCode.ERROR, message: failure.message });
+  span.recordException({
+    name: failure.type,
+    message: failure.message,
+    code: failure.code,
+    stack: failure.error.stack
+  });
+  span.end();
+}
+function traceparentOf(span) {
+  const { traceId, spanId, traceFlags } = span.spanContext();
+  return `00-${traceId}-${spanId}-${traceFlags.toString(16).padStart(2, "0")}`;
+}
 function recordStageEvent(span, stageName, state) {
+  if (state[STAGE_EVENTS_KEY] === false) return;
   const now = Date.now();
   const prev = state[STAGE_TS_KEY];
   const attributes = {};
@@ -1293,9 +1364,8 @@ function onHttpWillTrace(options, flowCtx) {
   });
   span.setAttribute(McpAttributes.SESSION_ID, sessionHash);
   span.setAttribute(FrontMcpAttributes.SESSION_ID_HASH, sessionHash);
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  ctx.set?.(HTTP_SPAN_CTX_KEY, spanCtx);
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "traceRequest", flowCtx.state);
 }
 function onHttpWillAcquireQuota(flowCtx) {
@@ -1339,7 +1409,7 @@ function onToolWillParse(options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startRpcSpan(tracer, {
     method: "tools/call",
@@ -1347,9 +1417,7 @@ function onToolWillParse(options, flowCtx) {
     sessionIdHash: sessionHash,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onToolWillFindTool(flowCtx) {
@@ -1417,10 +1485,10 @@ function onToolWillApplyUI(flowCtx) {
 function onToolDidFinalize(flowCtx) {
   const rpcSpan = flowCtx.state?.[SPAN_KEY];
   const toolSpan = flowCtx.state?.[EXEC_SPAN_KEY];
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    if (toolSpan) endSpanError(toolSpan, error instanceof Error ? error : String(error));
-    if (rpcSpan) endSpanError(rpcSpan, error instanceof Error ? error : String(error));
+    if (toolSpan) endFailedSpan(toolSpan, error);
+    if (rpcSpan) endFailedSpan(rpcSpan, error);
   } else if (rpcSpan) {
     recordStageEvent(rpcSpan, "finalize", flowCtx.state);
     endSpanOk(rpcSpan);
@@ -1431,7 +1499,7 @@ function onResourceWillParse(options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startRpcSpan(tracer, {
     method: "resources/read",
@@ -1439,9 +1507,7 @@ function onResourceWillParse(options, flowCtx) {
     sessionIdHash: sessionHash,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onResourceWillFind(flowCtx) {
@@ -1470,10 +1536,10 @@ function onResourceDidExecute(flowCtx) {
 function onResourceDidFinalize(flowCtx) {
   const rpcSpan = flowCtx.state?.[SPAN_KEY];
   const resSpan = flowCtx.state?.[EXEC_SPAN_KEY];
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    if (resSpan) endSpanError(resSpan, error instanceof Error ? error : String(error));
-    if (rpcSpan) endSpanError(rpcSpan, error instanceof Error ? error : String(error));
+    if (resSpan) endFailedSpan(resSpan, error);
+    if (rpcSpan) endFailedSpan(rpcSpan, error);
   } else if (rpcSpan) {
     recordStageEvent(rpcSpan, "finalize", flowCtx.state);
     endSpanOk(rpcSpan);
@@ -1484,7 +1550,7 @@ function onPromptWillParse(options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startRpcSpan(tracer, {
     method: "prompts/get",
@@ -1492,9 +1558,7 @@ function onPromptWillParse(options, flowCtx) {
     sessionIdHash: sessionHash,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onPromptWillFind(flowCtx) {
@@ -1526,10 +1590,10 @@ function onPromptDidExecute(flowCtx) {
 function onPromptDidFinalize(flowCtx) {
   const rpcSpan = flowCtx.state?.[SPAN_KEY];
   const promptSpan = flowCtx.state?.[EXEC_SPAN_KEY];
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    if (promptSpan) endSpanError(promptSpan, error instanceof Error ? error : String(error));
-    if (rpcSpan) endSpanError(rpcSpan, error instanceof Error ? error : String(error));
+    if (promptSpan) endFailedSpan(promptSpan, error);
+    if (rpcSpan) endFailedSpan(rpcSpan, error);
   } else if (rpcSpan) {
     recordStageEvent(rpcSpan, "finalize", flowCtx.state);
     endSpanOk(rpcSpan);
@@ -1540,7 +1604,7 @@ function onAgentWillParse(options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startRpcSpan(tracer, {
     method: "agents/call",
@@ -1548,9 +1612,7 @@ function onAgentWillParse(options, flowCtx) {
     sessionIdHash: sessionHash,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onAgentWillFind(flowCtx) {
@@ -1564,7 +1626,7 @@ function onAgentWillExecute(options, flowCtx) {
   const agentName = flowCtx.state?.input?.name ?? "unknown";
   const { span: agentSpan } = startSpan(tracer, {
     name: `agent ${agentName}`,
-    kind: import_api12.SpanKind.INTERNAL,
+    kind: import_api13.SpanKind.INTERNAL,
     attributes: {
       [FrontMcpAttributes.FLOW_NAME]: "agents:call-agent",
       [McpAttributes.COMPONENT_TYPE]: "agent",
@@ -1572,7 +1634,7 @@ function onAgentWillExecute(options, flowCtx) {
     },
     parentContext: rpcCtx
   });
-  const agentOTelCtx = import_api12.trace.setSpan(rpcCtx ?? import_api12.context.active(), agentSpan);
+  const agentOTelCtx = import_api13.trace.setSpan(rpcCtx ?? import_api13.context.active(), agentSpan);
   flowCtx.state[EXEC_SPAN_KEY] = agentSpan;
   flowCtx.state[STAGE_TS_KEY] = Date.now();
   recordStageEvent(agentSpan, "execute.start", flowCtx.state);
@@ -1589,10 +1651,10 @@ function onAgentDidExecute(flowCtx) {
 function onAgentDidFinalize(flowCtx) {
   const rpcSpan = flowCtx.state?.[SPAN_KEY];
   const agentSpan = flowCtx.state?.[EXEC_SPAN_KEY];
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    if (agentSpan) endSpanError(agentSpan, error instanceof Error ? error : String(error));
-    if (rpcSpan) endSpanError(rpcSpan, error instanceof Error ? error : String(error));
+    if (agentSpan) endFailedSpan(agentSpan, error);
+    if (rpcSpan) endFailedSpan(rpcSpan, error);
   } else if (rpcSpan) {
     recordStageEvent(rpcSpan, "finalize", flowCtx.state);
     endSpanOk(rpcSpan);
@@ -1603,11 +1665,11 @@ function onGenericFlowWillStart(flowName, options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startSpan(tracer, {
     name: flowName,
-    kind: import_api12.SpanKind.INTERNAL,
+    kind: import_api13.SpanKind.INTERNAL,
     attributes: {
       [FrontMcpAttributes.FLOW_NAME]: flowName,
       [McpAttributes.SESSION_ID]: sessionHash,
@@ -1617,9 +1679,7 @@ function onGenericFlowWillStart(flowName, options, flowCtx) {
     },
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
 }
 function onGenericFlowStage(stageName, flowCtx) {
   const span = flowCtx.state?.[SPAN_KEY];
@@ -1628,9 +1688,9 @@ function onGenericFlowStage(stageName, flowCtx) {
 function onGenericFlowDidFinalize(flowCtx) {
   const span = flowCtx.state?.[SPAN_KEY];
   if (!span) return;
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    endSpanError(span, error instanceof Error ? error : String(error));
+    endFailedSpan(span, error);
   } else {
     endSpanOk(span);
   }
@@ -1640,16 +1700,14 @@ function onTransportWillStart(transportType, options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const sessionHash = sessionTracingId(ctx.sessionId);
   const { span, context: spanCtx } = startTransportSpan(tracer, {
     type: transportType,
     sessionIdHash: sessionHash,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onTransportDidRoute(flowCtx) {
@@ -1667,9 +1725,9 @@ function onTransportDidFinalize(flowCtx) {
   const span = flowCtx.state?.[SPAN_KEY];
   if (!span) return;
   recordStageEvent(span, "cleanup", flowCtx.state);
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
-    endSpanError(span, error instanceof Error ? error : String(error));
+    endFailedSpan(span, error);
   } else {
     endSpanOk(span);
   }
@@ -1679,14 +1737,12 @@ function onAuthWillStart(flowName, options, flowCtx) {
   const ctx = extractContext(flowCtx);
   if (!ctx) return;
   const tracer = getTracer();
-  const parentOTelCtx = createOTelContextFromTrace(ctx.traceContext);
+  const parentOTelCtx = parentContextOf(ctx);
   const { span, context: spanCtx } = startAuthSpan(tracer, {
     flowName,
     parentContext: parentOTelCtx
   });
-  flowCtx.state[SPAN_KEY] = span;
-  flowCtx.state[SPAN_CTX_KEY] = spanCtx;
-  flowCtx.state[STAGE_TS_KEY] = Date.now();
+  beginFlowSpan(flowCtx, options, span, spanCtx);
   recordStageEvent(span, "parseInput", flowCtx.state);
 }
 function onAuthDidDetermineMode(flowCtx) {
@@ -1703,33 +1759,38 @@ function onAuthStage(stageName, flowCtx) {
 function onAuthDidFinalize(flowCtx) {
   const span = flowCtx.state?.[SPAN_KEY];
   if (!span) return;
-  const error = flowCtx.state?.error;
+  const error = flowCtx.state?.flowError;
   if (error) {
     setAuthResult(span, "unauthorized");
-    endSpanError(span, error instanceof Error ? error : String(error));
+    endFailedSpan(span, error);
   } else {
     setAuthResult(span, "authorized");
     endSpanOk(span);
   }
 }
 function wrapContextFetch(options, flowCtx) {
-  if (options.fetchSpans === false) return;
   const toolCtx = flowCtx.state?.toolContext ?? flowCtx.state?.toolCallContext;
   if (!toolCtx || typeof toolCtx.fetch !== "function") return;
   const originalFetch = toolCtx.fetch.bind(toolCtx);
   const parentOTelCtx = flowCtx.state?.[SPAN_CTX_KEY];
   toolCtx.fetch = async (input, init) => {
-    const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-    const method = init?.method ?? "GET";
-    const tracer = getTracer();
-    const { span } = startFetchSpan(tracer, { method, url, parentContext: parentOTelCtx });
+    const fetchSpan = options.fetchSpans === false ? void 0 : startFetchSpan(getTracer(), {
+      method: init?.method ?? (input instanceof Request ? input.method : "GET"),
+      url: typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url,
+      parentContext: parentOTelCtx
+    }).span;
+    const callingSpan = fetchSpan ?? flowCtx.state?.[EXEC_SPAN_KEY] ?? flowCtx.state?.[SPAN_KEY];
+    const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : void 0));
+    if (callingSpan && !headers.has("traceparent")) headers.set("traceparent", traceparentOf(callingSpan));
     try {
-      const response = await originalFetch(input, init);
-      setFetchResponseStatus(span, response.status);
-      endSpanOk(span);
+      const response = await originalFetch(input, { ...init, headers });
+      if (fetchSpan) {
+        setFetchResponseStatus(fetchSpan, response.status);
+        endSpanOk(fetchSpan);
+      }
       return response;
     } catch (err) {
-      endSpanError(span, err instanceof Error ? err : String(err));
+      if (fetchSpan) endSpanError(fetchSpan, err instanceof Error ? err : String(err));
       throw err;
     }
   };
@@ -1747,13 +1808,94 @@ function onAgentDidExecuteEnrich(flowCtx) {
     }
   }
 }
+var HOOK_OBSERVER_KEY = /* @__PURE__ */ Symbol.for("frontmcp:hook-observer");
+function installHookObserver(flowCtx, observer) {
+  const ctx = extractContext(flowCtx);
+  if (ctx && !ctx.get?.(HOOK_OBSERVER_KEY)) ctx.set?.(HOOK_OBSERVER_KEY, observer);
+}
+async function runInHookSpan(flowCtx, hook, run) {
+  const ctx = extractContext(flowCtx);
+  const { span } = startHookSpan(getTracer(), {
+    ...hook,
+    parentContext: flowCtx.state?.[SPAN_CTX_KEY] ?? (ctx && parentContextOf(ctx))
+  });
+  try {
+    await run();
+    endSpanOk(span);
+  } catch (error) {
+    if (error instanceof import_sdk2.FlowControl && error.type !== "fail" && error.type !== "abort") endSpanOk(span);
+    else endFailedSpan(span, error);
+    throw error;
+  }
+}
 function reportStartup(data) {
   const tracer = getTracer();
   emitStartupReport(tracer, data);
 }
 
+// libs/observability/src/request-log/request-log.tokens.ts
+var REQUEST_LOG_COLLECTOR = /* @__PURE__ */ Symbol.for("frontmcp:observability:request-log-collector");
+
+// libs/observability/src/request-log/request-log.hooks.ts
+var FRONTMCP_CONTEXT = /* @__PURE__ */ Symbol.for("frontmcp:CONTEXT");
+function resolve(flowCtx, token) {
+  try {
+    return flowCtx.get?.(token);
+  } catch {
+    return void 0;
+  }
+}
+function currentRequestLog(flowCtx) {
+  return resolve(flowCtx, FRONTMCP_CONTEXT)?.get(REQUEST_LOG_COLLECTOR);
+}
+function startRequestLog(flowCtx, options) {
+  const context = resolve(flowCtx, FRONTMCP_CONTEXT);
+  if (!context) return;
+  const collector = new RequestLogCollector(
+    {
+      requestId: context.requestId,
+      traceId: context.traceContext.traceId,
+      sessionIdHash: sessionTracingId(context.sessionId).slice(0, 12),
+      scopeId: context.scopeId
+    },
+    options
+  );
+  context.set(REQUEST_LOG_COLLECTOR, collector);
+  const request = flowCtx.rawInput?.request;
+  if (request?.method && request.path) collector.setHttpInfo(request.method, request.path);
+  const rpcMethod = request?.body?.method;
+  if (typeof rpcMethod === "string") collector.setRpcMethod(rpcMethod);
+}
+function recordRequestLogFailure(flowCtx) {
+  const flowError = flowCtx.state?.["flowError"];
+  if (!flowError) return;
+  const { type, message, code, errorId } = flowFailureOf(flowError);
+  currentRequestLog(flowCtx)?.setError({ type, message, code, error_id: errorId });
+}
+function recordRequestLogAuth(flowCtx) {
+  const verifyResult = flowCtx.state?.["verifyResult"];
+  const authorization = flowCtx.rawInput?.request?.headers?.["authorization"];
+  const scheme = typeof authorization === "string" ? authorization.trim().split(/\s+/)[0].toLowerCase() : "";
+  const sub = verifyResult?.authorization?.user?.sub;
+  const anonymous = typeof sub !== "string" || (0, import_sdk3.isAnonymousSubject)(sub);
+  currentRequestLog(flowCtx)?.setAuthInfo(
+    anonymous || !scheme ? "anonymous" : scheme,
+    verifyResult?.kind === "authorized" && !anonymous
+  );
+}
+async function completeRequestLog(flowCtx) {
+  const collector = currentRequestLog(flowCtx);
+  if (!collector || collector.isFinalized()) return;
+  const statusCode = flowCtx.state?.["statusCode"] ?? flowCtx.rawInput?.response?.statusCode;
+  if (typeof statusCode === "number") collector.setStatusCode(statusCode);
+  await collector.finalize();
+}
+
+// libs/observability/src/telemetry/telemetry.accessor.ts
+var import_api15 = require("@opentelemetry/api");
+
 // libs/observability/src/telemetry/telemetry.counters.ts
-var import_api13 = require("@opentelemetry/api");
+var import_api14 = require("@opentelemetry/api");
 function snapshotKey(name, attributes) {
   const keys = Object.keys(attributes).sort();
   if (keys.length === 0) return name;
@@ -1788,7 +1930,7 @@ var counterCache = /* @__PURE__ */ new Map();
 function createCounter(name, description) {
   const existing = counterCache.get(name);
   if (existing) return existing;
-  const meter = import_api13.metrics.getMeter(METER_NAME);
+  const meter = import_api14.metrics.getMeter(METER_NAME);
   const otelCounter = meter.createCounter(name, description ? { description } : void 0);
   const counter = new TelemetryCounterImpl(name, otelCounter);
   counterCache.set(name, counter);
@@ -1867,14 +2009,14 @@ var TelemetrySpan = class {
   /** Record an error on this span */
   recordError(error) {
     this.span.recordException(error);
-    this.span.setStatus({ code: import_api14.SpanStatusCode.ERROR, message: error.message });
+    this.span.setStatus({ code: import_api15.SpanStatusCode.ERROR, message: error.message });
     this.hasError = true;
     return this;
   }
   /** End the span (preserves ERROR status if already set) */
   end() {
     if (!this.hasError) {
-      this.span.setStatus({ code: import_api14.SpanStatusCode.OK });
+      this.span.setStatus({ code: import_api15.SpanStatusCode.OK });
     }
     this.span.end();
   }
@@ -1882,7 +2024,7 @@ var TelemetrySpan = class {
   endWithError(error) {
     const msg = typeof error === "string" ? error : error.message;
     if (error instanceof Error) this.span.recordException(error);
-    this.span.setStatus({ code: import_api14.SpanStatusCode.ERROR, message: msg });
+    this.span.setStatus({ code: import_api15.SpanStatusCode.ERROR, message: msg });
     this.span.end();
   }
   /** Get the underlying OTel span (escape hatch) */
@@ -1893,7 +2035,7 @@ var TelemetrySpan = class {
 var TelemetryAccessor = class {
   constructor(ctx) {
     this.ctx = ctx;
-    this.tracer = import_api14.trace.getTracer("@frontmcp/observability");
+    this.tracer = import_api15.trace.getTracer("@frontmcp/observability");
     this.fallbackContext = createOTelContextFromTrace(ctx.traceContext);
     this.sessionHash = sessionTracingId(ctx.sessionId);
     this.baseAttributes = {
@@ -1929,7 +2071,7 @@ var TelemetryAccessor = class {
     const span = this.tracer.startSpan(
       name,
       {
-        kind: import_api14.SpanKind.INTERNAL,
+        kind: import_api15.SpanKind.INTERNAL,
         attributes: { ...this.baseAttributes, ...attributes }
       },
       this.getActiveContext()
@@ -1978,11 +2120,11 @@ var TelemetryAccessor = class {
     } else {
       const span = this.tracer.startSpan(
         name,
-        { kind: import_api14.SpanKind.INTERNAL, attributes: this.baseAttributes },
+        { kind: import_api15.SpanKind.INTERNAL, attributes: this.baseAttributes },
         this.fallbackContext
       );
       if (attributes) span.addEvent(name, attributes);
-      span.setStatus({ code: import_api14.SpanStatusCode.OK });
+      span.setStatus({ code: import_api15.SpanStatusCode.OK });
       span.end();
     }
   }
@@ -2019,7 +2161,7 @@ var TelemetryAccessor = class {
    * Useful for including in external API calls or logs.
    */
   get traceId() {
-    return import_api14.trace.getSpan(this.fallbackContext)?.spanContext().traceId ?? "";
+    return import_api15.trace.getSpan(this.fallbackContext)?.spanContext().traceId ?? "";
   }
   /**
    * Get the session tracing ID (privacy-safe hash).
@@ -2030,10 +2172,10 @@ var TelemetryAccessor = class {
 };
 
 // libs/observability/src/telemetry/telemetry.factory.ts
-var import_api15 = require("@opentelemetry/api");
+var import_api16 = require("@opentelemetry/api");
 var TelemetryFactory = class {
   constructor(tracerName = "@frontmcp/observability") {
-    this.tracer = import_api15.trace.getTracer(tracerName);
+    this.tracer = import_api16.trace.getTracer(tracerName);
   }
   /**
    * Create (or retrieve cached) a named counter. Increments propagate to
@@ -2080,32 +2222,32 @@ var TELEMETRY_ACCESSOR = /* @__PURE__ */ Symbol.for("frontmcp:observability:tele
 var TELEMETRY_FACTORY = /* @__PURE__ */ Symbol.for("frontmcp:observability:telemetry-factory");
 
 // libs/observability/src/plugin/observability.plugin.ts
-var PromptHook = (0, import_sdk2.FlowHooksOf)("prompts:get-prompt");
-var ListPromptsHook = (0, import_sdk2.FlowHooksOf)("prompts:list-prompts");
-var SkillSearchHook = (0, import_sdk2.FlowHooksOf)("skills:search");
-var SkillLoadHook = (0, import_sdk2.FlowHooksOf)("skills:load");
-var CompletionHook = (0, import_sdk2.FlowHooksOf)("completion:complete");
-var LegacySseHook = (0, import_sdk2.FlowHooksOf)("handle:legacy-sse");
-var StreamableHttpHook = (0, import_sdk2.FlowHooksOf)("handle:streamable-http");
-var StatelessHttpHook = (0, import_sdk2.FlowHooksOf)("handle:stateless-http");
-var AuthVerifyHook = (0, import_sdk2.FlowHooksOf)("auth:verify");
-var SessionVerifyHook = (0, import_sdk2.FlowHooksOf)("session:verify");
-var OAuthTokenHook = (0, import_sdk2.FlowHooksOf)("oauth:token");
-var OAuthAuthorizeHook = (0, import_sdk2.FlowHooksOf)("oauth:authorize");
-var OAuthCallbackHook = (0, import_sdk2.FlowHooksOf)("oauth:callback");
-var OAuthProviderCallbackHook = (0, import_sdk2.FlowHooksOf)("oauth:provider-callback");
-var OAuthRegisterHook = (0, import_sdk2.FlowHooksOf)("oauth:register");
-var ElicitRequestHook = (0, import_sdk2.FlowHooksOf)("elicitation:request");
-var ElicitResultHook = (0, import_sdk2.FlowHooksOf)("elicitation:result");
-var SubscribeResourceHook = (0, import_sdk2.FlowHooksOf)("resources:subscribe");
-var UnsubscribeResourceHook = (0, import_sdk2.FlowHooksOf)("resources:unsubscribe");
-var SkillsHttpLlmTxtHook = (0, import_sdk2.FlowHooksOf)("skills-http:llm-txt");
-var SkillsHttpLlmFullTxtHook = (0, import_sdk2.FlowHooksOf)("skills-http:llm-full-txt");
-var SkillsHttpApiHook = (0, import_sdk2.FlowHooksOf)("skills-http:api");
-var WellKnownJwksHook = (0, import_sdk2.FlowHooksOf)("well-known.jwks");
-var WellKnownOAuthServerHook = (0, import_sdk2.FlowHooksOf)("well-known.oauth-authorization-server");
-var WellKnownPrmHook = (0, import_sdk2.FlowHooksOf)("well-known.prm");
-var LoggingSetLevelHook = (0, import_sdk2.FlowHooksOf)("logging:set-level");
+var PromptHook = (0, import_sdk4.FlowHooksOf)("prompts:get-prompt");
+var ListPromptsHook = (0, import_sdk4.FlowHooksOf)("prompts:list-prompts");
+var SkillSearchHook = (0, import_sdk4.FlowHooksOf)("skills:search");
+var SkillLoadHook = (0, import_sdk4.FlowHooksOf)("skills:load");
+var CompletionHook = (0, import_sdk4.FlowHooksOf)("completion:complete");
+var LegacySseHook = (0, import_sdk4.FlowHooksOf)("handle:legacy-sse");
+var StreamableHttpHook = (0, import_sdk4.FlowHooksOf)("handle:streamable-http");
+var StatelessHttpHook = (0, import_sdk4.FlowHooksOf)("handle:stateless-http");
+var AuthVerifyHook = (0, import_sdk4.FlowHooksOf)("auth:verify");
+var SessionVerifyHook = (0, import_sdk4.FlowHooksOf)("session:verify");
+var OAuthTokenHook = (0, import_sdk4.FlowHooksOf)("oauth:token");
+var OAuthAuthorizeHook = (0, import_sdk4.FlowHooksOf)("oauth:authorize");
+var OAuthCallbackHook = (0, import_sdk4.FlowHooksOf)("oauth:callback");
+var OAuthProviderCallbackHook = (0, import_sdk4.FlowHooksOf)("oauth:provider-callback");
+var OAuthRegisterHook = (0, import_sdk4.FlowHooksOf)("oauth:register");
+var ElicitRequestHook = (0, import_sdk4.FlowHooksOf)("elicitation:request");
+var ElicitResultHook = (0, import_sdk4.FlowHooksOf)("elicitation:result");
+var SubscribeResourceHook = (0, import_sdk4.FlowHooksOf)("resources:subscribe");
+var UnsubscribeResourceHook = (0, import_sdk4.FlowHooksOf)("resources:unsubscribe");
+var SkillsHttpLlmTxtHook = (0, import_sdk4.FlowHooksOf)("skills-http:llm-txt");
+var SkillsHttpLlmFullTxtHook = (0, import_sdk4.FlowHooksOf)("skills-http:llm-full-txt");
+var SkillsHttpApiHook = (0, import_sdk4.FlowHooksOf)("skills-http:api");
+var WellKnownJwksHook = (0, import_sdk4.FlowHooksOf)("well-known.jwks");
+var WellKnownOAuthServerHook = (0, import_sdk4.FlowHooksOf)("well-known.oauth-authorization-server");
+var WellKnownPrmHook = (0, import_sdk4.FlowHooksOf)("well-known.prm");
+var LoggingSetLevelHook = (0, import_sdk4.FlowHooksOf)("logging:set-level");
 var DEFAULT_TRACING = {
   httpSpans: true,
   executionSpans: true,
@@ -2118,17 +2260,46 @@ var DEFAULT_TRACING = {
   elicitationSpans: true,
   startupReport: true
 };
-var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
+var ObservabilityPlugin = class extends import_sdk4.DynamicPlugin {
   constructor(options = {}) {
     super();
+    /** Wraps each other hook the request runs: names it on the request's log, and gives it a span with `hookSpans`. */
+    this.observeHook = async ({ flowName, stage, target, flowContext }, run) => {
+      if (target === this) return run();
+      if (this.requestLogsEnabled) currentRequestLog(flowContext)?.addHook(`${flowName}:${stage}`);
+      if (!this.traces("hookSpans")) return run();
+      const owner = target?.constructor?.name;
+      return runInHookSpan(flowContext, { flowName, stage, owner }, run);
+    };
     this.options = resolveOptions(options);
     this.tracingOpts = this.options.tracing !== false ? this.options.tracing : DEFAULT_TRACING;
   }
   get tracingEnabled() {
     return this.options.tracing !== false;
   }
+  get requestLogsEnabled() {
+    return this.options.requestLogs !== false;
+  }
+  /** Whether tracing is on and its `kind` option isn't off. */
+  traces(kind) {
+    return this.tracingEnabled && this.tracingOpts[kind] !== false;
+  }
+  /** Watches the hooks of the request `ctx` serves, from the first flow of it that this plugin sees. */
+  watchHooks(ctx) {
+    if (this.requestLogsEnabled || this.traces("hookSpans"))
+      installHookObserver(ctx, this.observeHook);
+  }
+  /** Names the entry a request serves on its request log, and records the entry flow's failure. */
+  annotateRequestLog(ctx, set) {
+    if (!this.requestLogsEnabled) return;
+    const flowCtx = ctx;
+    const log = currentRequestLog(ctx);
+    if (log && flowCtx.state?.input) set(log, flowCtx.state.input);
+  }
   _httpWillTrace(ctx) {
     if (this.tracingEnabled) onHttpWillTrace(this.tracingOpts, ctx);
+    if (this.options.requestLogs !== false) startRequestLog(ctx, this.options.requestLogs);
+    this.watchHooks(ctx);
   }
   _httpWillQuota(ctx) {
     if (this.tracingEnabled) onHttpWillAcquireQuota(ctx);
@@ -2141,6 +2312,7 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   }
   _httpDidAuth(ctx) {
     if (this.tracingEnabled) onHttpDidCheckAuth(ctx);
+    if (this.requestLogsEnabled) recordRequestLogAuth(ctx);
   }
   _httpWillRoute(ctx) {
     if (this.tracingEnabled) onHttpWillRoute(ctx);
@@ -2150,12 +2322,15 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   }
   _httpDidFinalize(ctx) {
     if (this.tracingEnabled) onHttpDidFinalize(ctx);
+    if (this.requestLogsEnabled) void completeRequestLog(ctx);
   }
   _toolWillParse(ctx) {
+    this.watchHooks(ctx);
     if (this.tracingEnabled) onToolWillParse(this.tracingOpts, ctx);
   }
   _toolWillFind(ctx) {
     if (this.tracingEnabled) onToolWillFindTool(ctx);
+    this.annotateRequestLog(ctx, (log, input) => log.setToolName(String(input["name"])));
   }
   _toolWillCheckAuth(ctx) {
     if (this.tracingEnabled) onToolWillCheckAuth(ctx);
@@ -2186,12 +2361,15 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   }
   _toolDidFinalize(ctx) {
     if (this.tracingEnabled) onToolDidFinalize(ctx);
+    if (this.requestLogsEnabled) recordRequestLogFailure(ctx);
   }
   _resourceWillParse(ctx) {
+    this.watchHooks(ctx);
     if (this.tracingEnabled) onResourceWillParse(this.tracingOpts, ctx);
   }
   _resourceWillFind(ctx) {
     if (this.tracingEnabled) onResourceWillFind(ctx);
+    this.annotateRequestLog(ctx, (log, input) => log.setResourceUri(String(input["uri"])));
   }
   _resourceWillCheckAuthorities(ctx) {
     if (this.tracingEnabled) onEntryWillCheckAuthorities(ctx);
@@ -2207,12 +2385,15 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   }
   _resourceDidFinalize(ctx) {
     if (this.tracingEnabled) onResourceDidFinalize(ctx);
+    if (this.requestLogsEnabled) recordRequestLogFailure(ctx);
   }
   _promptWillParse(ctx) {
+    this.watchHooks(ctx);
     if (this.tracingEnabled) onPromptWillParse(this.tracingOpts, ctx);
   }
   _promptWillFind(ctx) {
     if (this.tracingEnabled) onPromptWillFind(ctx);
+    this.annotateRequestLog(ctx, (log, input) => log.setPromptName(String(input["name"])));
   }
   _promptWillCheckAuthorities(ctx) {
     if (this.tracingEnabled) onEntryWillCheckAuthorities(ctx);
@@ -2228,8 +2409,10 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   }
   _promptDidFinalize(ctx) {
     if (this.tracingEnabled) onPromptDidFinalize(ctx);
+    if (this.requestLogsEnabled) recordRequestLogFailure(ctx);
   }
   _agentWillParse(ctx) {
+    this.watchHooks(ctx);
     if (this.tracingEnabled) onAgentWillParse(this.tracingOpts, ctx);
   }
   _agentWillFind(ctx) {
@@ -2383,46 +2566,46 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
     if (this.tracingEnabled) onAuthDidFinalize(ctx);
   }
   _oauthTokenWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("oauth/token", this.tracingOpts, ctx);
+    if (this.traces("oauthSpans")) onGenericFlowWillStart("oauth/token", this.tracingOpts, ctx);
   }
   _oauthTokenDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("oauthSpans")) onGenericFlowDidFinalize(ctx);
   }
   _oauthAuthzWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("oauth/authorize", this.tracingOpts, ctx);
+    if (this.traces("oauthSpans")) onGenericFlowWillStart("oauth/authorize", this.tracingOpts, ctx);
   }
   _oauthAuthzDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("oauthSpans")) onGenericFlowDidFinalize(ctx);
   }
   _oauthCallbackWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("oauth/callback", this.tracingOpts, ctx);
+    if (this.traces("oauthSpans")) onGenericFlowWillStart("oauth/callback", this.tracingOpts, ctx);
   }
   _oauthCallbackDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("oauthSpans")) onGenericFlowDidFinalize(ctx);
   }
   _oauthProviderWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("oauth/provider-callback", this.tracingOpts, ctx);
+    if (this.traces("oauthSpans")) onGenericFlowWillStart("oauth/provider-callback", this.tracingOpts, ctx);
   }
   _oauthProviderDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("oauthSpans")) onGenericFlowDidFinalize(ctx);
   }
   _oauthRegisterWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("oauth/register", this.tracingOpts, ctx);
+    if (this.traces("oauthSpans")) onGenericFlowWillStart("oauth/register", this.tracingOpts, ctx);
   }
   _oauthRegisterDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("oauthSpans")) onGenericFlowDidFinalize(ctx);
   }
   _elicitReqWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("elicitation/request", this.tracingOpts, ctx);
+    if (this.traces("elicitationSpans")) onGenericFlowWillStart("elicitation/request", this.tracingOpts, ctx);
   }
   _elicitReqDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("elicitationSpans")) onGenericFlowDidFinalize(ctx);
   }
   _elicitResWill(ctx) {
-    if (this.tracingEnabled) onGenericFlowWillStart("elicitation/result", this.tracingOpts, ctx);
+    if (this.traces("elicitationSpans")) onGenericFlowWillStart("elicitation/result", this.tracingOpts, ctx);
   }
   _elicitResDone(ctx) {
-    if (this.tracingEnabled) onGenericFlowDidFinalize(ctx);
+    if (this.traces("elicitationSpans")) onGenericFlowDidFinalize(ctx);
   }
   _subscribeWill(ctx) {
     if (this.tracingEnabled) onGenericFlowWillStart("resources/subscribe", this.tracingOpts, ctx);
@@ -2488,12 +2671,10 @@ var ObservabilityPlugin = class extends import_sdk2.DynamicPlugin {
   // Startup Report (public method)
   // ═══════════════════════════════════════════════════════════════════════════
   /**
-   * Emit startup telemetry report.
-   * Call after scope.initialize() completes with component counts.
+   * Emit the `frontmcp.startup` span (`tracing.startupReport`). The scope calls it once it is ready.
    */
   reportStartupTelemetry(data) {
-    if (this.options.tracing === false) return;
-    reportStartup(data);
+    if (this.traces("startupReport")) reportStartup(data);
   }
 };
 ObservabilityPlugin.defaultOptions = {
@@ -2511,7 +2692,7 @@ ObservabilityPlugin.dynamicProviders = (input) => {
     providers.push({
       name: "observability:tracer",
       provide: OTEL_TRACER,
-      useValue: import_api16.trace.getTracer("@frontmcp/observability")
+      useValue: import_api17.trace.getTracer("@frontmcp/observability")
     });
     providers.push({
       name: "observability:config",
@@ -2521,8 +2702,8 @@ ObservabilityPlugin.dynamicProviders = (input) => {
     providers.push({
       name: "observability:telemetry-accessor",
       provide: TELEMETRY_ACCESSOR,
-      scope: import_sdk2.ProviderScope.CONTEXT,
-      inject: () => [import_sdk2.FRONTMCP_CONTEXT],
+      scope: import_sdk4.ProviderScope.CONTEXT,
+      inject: () => [import_sdk4.FRONTMCP_CONTEXT],
       useFactory: (ctx) => new TelemetryAccessor(ctx)
     });
     providers.push({
@@ -2554,8 +2735,8 @@ ObservabilityPlugin.dynamicProviders = (input) => {
     providers.push({
       name: "observability:request-log-collector",
       provide: REQUEST_LOG_COLLECTOR,
-      scope: import_sdk2.ProviderScope.CONTEXT,
-      inject: () => [import_sdk2.FRONTMCP_CONTEXT],
+      scope: import_sdk4.ProviderScope.CONTEXT,
+      inject: () => [import_sdk4.FRONTMCP_CONTEXT],
       useFactory: (ctx) => {
         return new RequestLogCollector(
           {
@@ -2572,85 +2753,85 @@ ObservabilityPlugin.dynamicProviders = (input) => {
   return providers;
 };
 __decorateClass([
-  import_sdk2.HttpHook.Will("traceRequest", { priority: -1e3 })
+  import_sdk4.HttpHook.Will("traceRequest", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_httpWillTrace", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Will("acquireQuota", { priority: -1e3 })
+  import_sdk4.HttpHook.Will("acquireQuota", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_httpWillQuota", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Did("acquireSemaphore", { priority: 1e3 })
+  import_sdk4.HttpHook.Did("acquireSemaphore", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_httpDidSemaphore", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Will("checkAuthorization", { priority: -1e3 })
+  import_sdk4.HttpHook.Will("checkAuthorization", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_httpWillAuth", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Did("checkAuthorization", { priority: 1e3 })
+  import_sdk4.HttpHook.Did("checkAuthorization", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_httpDidAuth", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Will("router", { priority: -1e3 })
+  import_sdk4.HttpHook.Will("router", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_httpWillRoute", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Did("router", { priority: 1e3 })
+  import_sdk4.HttpHook.Did("router", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_httpDidRoute", 1);
 __decorateClass([
-  import_sdk2.HttpHook.Did("finalize", { priority: 1e3 })
+  import_sdk4.HttpHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_httpDidFinalize", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillParse", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("findTool", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("findTool", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillFind", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("checkToolAuthorization", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("checkToolAuthorization", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillCheckAuth", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("checkEntryAuthorities", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("checkEntryAuthorities", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Did("checkEntryAuthorities", { priority: 1e3 })
+  import_sdk4.ToolHook.Did("checkEntryAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_toolDidCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("createToolCallContext", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("createToolCallContext", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillCreateCtx", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("validateInput", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("validateInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillValidate", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("execute", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("execute", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillExecute", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Did("execute", { priority: 1e3 })
+  import_sdk4.ToolHook.Did("execute", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_toolDidExecute", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("validateOutput", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("validateOutput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillValidateOut", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Will("applyUI", { priority: -1e3 })
+  import_sdk4.ToolHook.Will("applyUI", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_toolWillApplyUI", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Did("finalize", { priority: 1e3 })
+  import_sdk4.ToolHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_toolDidFinalize", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.ResourceHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_resourceWillParse", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Will("findResource", { priority: -1e3 })
+  import_sdk4.ResourceHook.Will("findResource", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_resourceWillFind", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Will("checkEntryAuthorities", { priority: -1e3 })
+  import_sdk4.ResourceHook.Will("checkEntryAuthorities", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_resourceWillCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Did("checkEntryAuthorities", { priority: 1e3 })
+  import_sdk4.ResourceHook.Did("checkEntryAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_resourceDidCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Will("execute", { priority: -1e3 })
+  import_sdk4.ResourceHook.Will("execute", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_resourceWillExecute", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Did("execute", { priority: 1e3 })
+  import_sdk4.ResourceHook.Did("execute", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_resourceDidExecute", 1);
 __decorateClass([
-  import_sdk2.ResourceHook.Did("finalize", { priority: 1e3 })
+  import_sdk4.ResourceHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_resourceDidFinalize", 1);
 __decorateClass([
   PromptHook.Will("parseInput", { priority: -1e3 })
@@ -2674,55 +2855,55 @@ __decorateClass([
   PromptHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_promptDidFinalize", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.AgentCallHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_agentWillParse", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Will("findAgent", { priority: -1e3 })
+  import_sdk4.AgentCallHook.Will("findAgent", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_agentWillFind", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Will("checkEntryAuthorities", { priority: -1e3 })
+  import_sdk4.AgentCallHook.Will("checkEntryAuthorities", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_agentWillCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Did("checkEntryAuthorities", { priority: 1e3 })
+  import_sdk4.AgentCallHook.Did("checkEntryAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_agentDidCheckAuthorities", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Will("execute", { priority: -1e3 })
+  import_sdk4.AgentCallHook.Will("execute", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_agentWillExecute", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Did("execute", { priority: 1e3 })
+  import_sdk4.AgentCallHook.Did("execute", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_agentDidExecute", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Did("finalize", { priority: 1e3 })
+  import_sdk4.AgentCallHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_agentDidFinalize", 1);
 __decorateClass([
-  import_sdk2.ListToolsHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.ListToolsHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_listToolsWill", 1);
 __decorateClass([
-  import_sdk2.ListToolsHook.Did("findTools", { priority: 1e3 })
+  import_sdk4.ListToolsHook.Did("findTools", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listToolsDidFind", 1);
 __decorateClass([
-  import_sdk2.ListToolsHook.Did("filterByAuthorities", { priority: 1e3 })
+  import_sdk4.ListToolsHook.Did("filterByAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listToolsDidFilter", 1);
 __decorateClass([
-  import_sdk2.ListToolsHook.Did("parseTools", { priority: 1e3 })
+  import_sdk4.ListToolsHook.Did("parseTools", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listToolsDone", 1);
 __decorateClass([
-  import_sdk2.ListResourcesHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.ListResourcesHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_listResourcesWill", 1);
 __decorateClass([
-  import_sdk2.ListResourcesHook.Did("filterByAuthorities", { priority: 1e3 })
+  import_sdk4.ListResourcesHook.Did("filterByAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listResourcesDidFilter", 1);
 __decorateClass([
-  import_sdk2.ListResourcesHook.Did("parseResources", { priority: 1e3 })
+  import_sdk4.ListResourcesHook.Did("parseResources", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listResourcesDone", 1);
 __decorateClass([
-  import_sdk2.ListResourceTemplatesHook.Will("parseInput", { priority: -1e3 })
+  import_sdk4.ListResourceTemplatesHook.Will("parseInput", { priority: -1e3 })
 ], ObservabilityPlugin.prototype, "_listTemplatesWill", 1);
 __decorateClass([
-  import_sdk2.ListResourceTemplatesHook.Did("filterByAuthorities", { priority: 1e3 })
+  import_sdk4.ListResourceTemplatesHook.Did("filterByAuthorities", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listTemplatesDidFilter", 1);
 __decorateClass([
-  import_sdk2.ListResourceTemplatesHook.Did("parseTemplates", { priority: 1e3 })
+  import_sdk4.ListResourceTemplatesHook.Did("parseTemplates", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_listTemplatesDone", 1);
 __decorateClass([
   ListPromptsHook.Will("parseInput", { priority: -1e3 })
@@ -2923,13 +3104,13 @@ __decorateClass([
   LoggingSetLevelHook.Did("finalize", { priority: 1e3 })
 ], ObservabilityPlugin.prototype, "_setLevelDone", 1);
 __decorateClass([
-  import_sdk2.ToolHook.Did("createToolCallContext", { priority: 999 })
+  import_sdk4.ToolHook.Did("createToolCallContext", { priority: 999 })
 ], ObservabilityPlugin.prototype, "_toolDidCreateCtxFetch", 1);
 __decorateClass([
-  import_sdk2.AgentCallHook.Did("execute", { priority: 999 })
+  import_sdk4.AgentCallHook.Did("execute", { priority: 999 })
 ], ObservabilityPlugin.prototype, "_agentDidExecuteMeta", 1);
 ObservabilityPlugin = __decorateClass([
-  (0, import_sdk2.Plugin)({
+  (0, import_sdk4.Plugin)({
     name: "observability",
     description: "Full-system OpenTelemetry instrumentation, structured logging, and request logs",
     providers: [],
@@ -2966,11 +3147,11 @@ function resolveRequestLogOptions(input) {
 }
 
 // libs/observability/src/otel/context-propagator.ts
-var import_api17 = require("@opentelemetry/api");
+var import_api18 = require("@opentelemetry/api");
 var TRACEPARENT_HEADER = "traceparent";
 var FrontMcpPropagator = class {
   inject(context, carrier, setter) {
-    const span = import_api17.trace.getSpan(context);
+    const span = import_api18.trace.getSpan(context);
     if (!span) return;
     const sc = span.spanContext();
     if (!sc || !isValidSpanContext(sc)) return;
@@ -2990,8 +3171,8 @@ var FrontMcpPropagator = class {
       traceFlags: parsed.traceFlags,
       isRemote: true
     };
-    const span = import_api17.trace.wrapSpanContext(spanContext);
-    return import_api17.trace.setSpan(context, span);
+    const span = import_api18.trace.wrapSpanContext(spanContext);
+    return import_api18.trace.setSpan(context, span);
   }
   fields() {
     return [TRACEPARENT_HEADER];
@@ -3058,33 +3239,6 @@ function setupOTel(options) {
   }
 }
 
-// libs/observability/src/otel/spans/hook.span.ts
-var import_api18 = require("@opentelemetry/api");
-function recordHookEvent(parentSpan, stage, owner) {
-  const attributes = {};
-  if (owner) {
-    attributes[FrontMcpAttributes.HOOK_OWNER] = owner;
-  }
-  parentSpan.addEvent(`hook.${stage}`, attributes);
-}
-function startHookSpan(tracer, options) {
-  const attributes = {
-    [FrontMcpAttributes.HOOK_STAGE]: options.stage
-  };
-  if (options.owner) {
-    attributes[FrontMcpAttributes.HOOK_OWNER] = options.owner;
-  }
-  if (options.flowName) {
-    attributes[FrontMcpAttributes.FLOW_NAME] = options.flowName;
-  }
-  return startSpan(tracer, {
-    name: `hook ${options.stage}`,
-    kind: import_api18.SpanKind.INTERNAL,
-    attributes,
-    parentContext: options.parentContext
-  });
-}
-
 // libs/observability/src/otel/spans/pretty-span-exporter.ts
 var import_api19 = require("@opentelemetry/api");
 var RESET = "\x1B[0m";
@@ -3252,6 +3406,13 @@ function renderJsonExposition(counters, gauges = []) {
 var import_utils2 = require("@frontmcp/utils");
 var NS_PER_SECOND = 1e9;
 var MICROS_PER_SECOND = 1e6;
+function probeSafely(probe) {
+  try {
+    return probe();
+  } catch {
+    return void 0;
+  }
+}
 function defaultMonitorEventLoopDelay() {
   try {
     const { monitorEventLoopDelay } = require("node:perf_hooks");
@@ -3297,54 +3458,70 @@ var ProcessStatsCollector = class {
     this.getActiveHandles = init.getActiveHandles ?? defaultGetActiveHandles;
     this.getActiveRequests = init.getActiveRequests ?? defaultGetActiveRequests;
     this.readFdCount = init.readFdCount ?? defaultReadFdCount;
-    this.cpuStart = this.cpuUsage();
+    this.cpuStart = probeSafely(() => this.cpuUsage());
     if (this.options.eventLoopLag !== false) {
       this.histogram = init.monitorEventLoopDelay ? init.monitorEventLoopDelay() : defaultMonitorEventLoopDelay();
     }
   }
   collect() {
     const entries = [];
-    const cpu = this.cpuUsage(this.cpuStart);
-    entries.push({
-      name: "frontmcp_process_cpu_seconds_total",
-      value: cpu.user / MICROS_PER_SECOND,
-      attributes: { mode: "user" },
-      help: "CPU time consumed since collector start, by mode (seconds)"
-    });
-    entries.push({
-      name: "frontmcp_process_cpu_seconds_total",
-      value: cpu.system / MICROS_PER_SECOND,
-      attributes: { mode: "system" }
-    });
-    const mem = this.memoryUsage();
-    entries.push({
-      name: "frontmcp_process_resident_memory_bytes",
-      value: mem.rss,
-      help: "Resident memory size in bytes"
-    });
-    entries.push({
-      name: "frontmcp_process_heap_bytes",
-      value: mem.heapTotal,
-      help: "Total V8 heap size in bytes"
-    });
-    entries.push({
-      name: "frontmcp_process_heap_used_bytes",
-      value: mem.heapUsed,
-      help: "Used V8 heap size in bytes"
-    });
-    entries.push({
-      name: "frontmcp_process_external_bytes",
-      value: mem.external,
-      help: "Memory used by C++ objects bound to JS in bytes"
-    });
-    entries.push({
-      name: "frontmcp_process_uptime_seconds",
-      value: this.uptime(),
-      help: "Time since process start in seconds"
+    this.cpuStart ??= probeSafely(() => this.cpuUsage());
+    const cpu = this.cpuStart && probeSafely(() => this.cpuUsage(this.cpuStart));
+    if (cpu) {
+      entries.push({
+        name: "frontmcp_process_cpu_seconds_total",
+        value: cpu.user / MICROS_PER_SECOND,
+        attributes: { mode: "user" },
+        help: "CPU time consumed since collector start, by mode (seconds)"
+      });
+      entries.push({
+        name: "frontmcp_process_cpu_seconds_total",
+        value: cpu.system / MICROS_PER_SECOND,
+        attributes: { mode: "system" }
+      });
+    }
+    const mem = probeSafely(() => this.memoryUsage());
+    if (mem && mem.rss > 0) {
+      entries.push({
+        name: "frontmcp_process_resident_memory_bytes",
+        value: mem.rss,
+        help: "Resident memory size in bytes"
+      });
+      entries.push({
+        name: "frontmcp_process_heap_bytes",
+        value: mem.heapTotal,
+        help: "Total V8 heap size in bytes"
+      });
+      entries.push({
+        name: "frontmcp_process_heap_used_bytes",
+        value: mem.heapUsed,
+        help: "Used V8 heap size in bytes"
+      });
+      entries.push({
+        name: "frontmcp_process_external_bytes",
+        value: mem.external,
+        help: "Memory used by C++ objects bound to JS in bytes"
+      });
+    }
+    const uptime = probeSafely(() => this.uptime());
+    if (uptime !== void 0 && uptime > 0) {
+      entries.push({
+        name: "frontmcp_process_uptime_seconds",
+        value: uptime,
+        help: "Time since process start in seconds"
+      });
+    }
+    const histogram = this.options.eventLoopLag !== false ? this.histogram : void 0;
+    const lag = histogram && probeSafely(() => {
+      const sample = {
+        meanSeconds: histogram.mean / NS_PER_SECOND,
+        p99Seconds: histogram.percentile(99) / NS_PER_SECOND
+      };
+      histogram.reset();
+      return sample;
     });
-    if (this.options.eventLoopLag !== false && this.histogram) {
-      const meanSeconds = this.histogram.mean / NS_PER_SECOND;
-      const p99Seconds = this.histogram.percentile(99) / NS_PER_SECOND;
+    if (lag) {
+      const { meanSeconds, p99Seconds } = lag;
       if (Number.isFinite(meanSeconds)) {
         entries.push({
           name: "frontmcp_nodejs_eventloop_lag_seconds",
@@ -3360,7 +3537,6 @@ var ProcessStatsCollector = class {
           attributes: { quantile: "p99" }
         });
       }
-      this.histogram.reset();
     }
     if (this.options.activeHandles !== false) {
       const handles = this.getActiveHandles?.();