autotel-terminal 17.0.4 → 17.0.5

package/dist/cli.cjs

@@ -111,6 +111,25 @@ function createTerminalSpanStream(processor) {
         const startTime = timeToMs(span.startTime);
         const endTime = timeToMs(span.endTime);
         const durationMs = endTime - startTime;
+        const resourceAttrs = span.resource?.attributes ?? {};
+        const spanAttrs = span.attributes;
+        const mergedAttrs = {};
+        for (const [k, v] of Object.entries(resourceAttrs)) {
+          mergedAttrs[k] = v;
+        }
+        for (const [k, v] of Object.entries(spanAttrs)) {
+          mergedAttrs[k] = v;
+        }
+        const spanEvents = span.events?.length ? span.events.map((e) => ({
+          name: e.name,
+          timeMs: timeToMs(e.time),
+          attributes: e.attributes
+        })) : void 0;
+        const spanLinks = span.links?.length ? span.links.map((l) => ({
+          traceId: l.context.traceId,
+          spanId: l.context.spanId,
+          attributes: l.attributes
+        })) : void 0;
         const event = {
           name: span.name,
           spanId: spanContext.spanId,
@@ -121,7 +140,9 @@ function createTerminalSpanStream(processor) {
           durationMs,
           status: mapStatus(span.status.code),
           kind: mapKind(span.kind),
-          attributes: span.attributes
+          attributes: mergedAttrs,
+          ...spanEvents ? { events: spanEvents } : {},
+          ...spanLinks ? { links: spanLinks } : {}
         };
         callback(event);
       });
@@ -561,6 +582,123 @@ function buildErrorSummaries(traceSummaries) {
   return out;
 }
 
+// src/lib/topology-model.ts
+function getServiceName2(span) {
+  const attrs = span.attributes ?? {};
+  const serviceName = attrs["service.name"] ?? attrs["resource.service.name"];
+  return serviceName || "unknown";
+}
+function getPeerService(span) {
+  const attrs = span.attributes ?? {};
+  const peerService = attrs["peer.service"] ?? attrs["db.system"] ?? attrs["messaging.system"] ?? attrs["http.host"];
+  return peerService ?? null;
+}
+function buildServiceGraph(spans) {
+  const byService = /* @__PURE__ */ new Map();
+  for (const span of spans) {
+    const svc = getServiceName2(span);
+    const entry = byService.get(svc) ?? {
+      durations: [],
+      spanCount: 0,
+      errorCount: 0
+    };
+    entry.spanCount += 1;
+    entry.durations.push(span.durationMs);
+    if (span.status === "ERROR") entry.errorCount += 1;
+    byService.set(svc, entry);
+  }
+  const services = [];
+  for (const [serviceName, { durations, spanCount, errorCount }] of byService) {
+    if (spanCount === 0) continue;
+    const avgDurationMs = durations.reduce((acc, d) => acc + d, 0) / durations.length;
+    const sorted = durations.toSorted((a, b) => a - b);
+    const p95Index = Math.floor(sorted.length * 0.95);
+    const p95DurationMs = sorted[p95Index] ?? sorted.at(-1) ?? 0;
+    services.push({
+      serviceName,
+      spanCount,
+      errorCount,
+      avgDurationMs,
+      p95DurationMs
+    });
+  }
+  const byEdge = /* @__PURE__ */ new Map();
+  for (const span of spans) {
+    const to = getPeerService(span);
+    if (!to) continue;
+    const from = getServiceName2(span);
+    const key = `${from}\u2192${to}`;
+    const entry = byEdge.get(key) ?? { spanCount: 0, errorCount: 0 };
+    entry.spanCount += 1;
+    if (span.status === "ERROR") entry.errorCount += 1;
+    byEdge.set(key, entry);
+  }
+  const edges = [];
+  for (const [key, { spanCount, errorCount }] of byEdge) {
+    const [fromService, toService] = key.split("\u2192");
+    edges.push({ fromService, toService, spanCount, errorCount });
+  }
+  services.sort((a, b) => b.spanCount - a.spanCount);
+  edges.sort((a, b) => b.spanCount - a.spanCount);
+  return { services, edges };
+}
+
+// src/lib/topology-render.ts
+function renderTopologyAscii(graph) {
+  if (graph.services.length === 0) {
+    return ["  No services detected yet."];
+  }
+  const targetServices = new Set(graph.edges.map((e) => e.toService));
+  const roots = graph.services.filter(
+    (s) => !targetServices.has(s.serviceName)
+  );
+  const rootList = roots.length > 0 ? roots : [...graph.services];
+  const lines = [];
+  for (const root of rootList) {
+    renderNode(graph, root.serviceName, "", true, lines, /* @__PURE__ */ new Set());
+  }
+  return lines;
+}
+function renderNode(graph, serviceName, prefix, isRoot, lines, ancestors) {
+  const svc = graph.services.find((s) => s.serviceName === serviceName);
+  const label = svc ? formatServiceLine(svc) : `[${serviceName}]`;
+  if (isRoot) {
+    lines.push(label);
+  }
+  if (ancestors.has(serviceName)) return;
+  const pathAncestors = new Set(ancestors);
+  pathAncestors.add(serviceName);
+  const outgoing = graph.edges.filter((e) => e.fromService === serviceName);
+  for (let i = 0; i < outgoing.length; i++) {
+    const edge = outgoing[i];
+    const isLast = i === outgoing.length - 1;
+    const connector = isLast ? "\u2514" : "\u251C";
+    const childPrefix = isLast ? "    " : "\u2502   ";
+    const downstream = graph.services.find(
+      (s) => s.serviceName === edge.toService
+    );
+    const edgeLabel = formatEdgeLabel(edge);
+    const downstreamLabel = downstream ? formatServiceLine(downstream) : `[${edge.toService}]`;
+    lines.push(`${prefix}    ${connector}\u2500\u2500${edgeLabel}\u2500\u2500\u2192 ${downstreamLabel}`);
+    renderNode(
+      graph,
+      edge.toService,
+      prefix + "    " + childPrefix,
+      false,
+      lines,
+      pathAncestors
+    );
+  }
+}
+function formatServiceLine(svc) {
+  const errPart = svc.errorCount > 0 ? ` \xB7 ${svc.errorCount} err` : "";
+  return `[${svc.serviceName}] ${svc.spanCount} spans${errPart} \xB7 p95 ${formatDurationMs(svc.p95DurationMs)}`;
+}
+function formatEdgeLabel(edge) {
+  const errPart = edge.errorCount > 0 ? `, ${edge.errorCount} err` : "";
+  return `(${edge.spanCount}${errPart})`;
+}
+
 // src/lib/export-model.ts
 function exportTraceToJson(trace, logs) {
   const exported = {
@@ -1078,6 +1216,8 @@ function Dashboard({
     [spansForSelectedService]
   );
   const selectedTraceSummary = drilldownTraceId == null ? filteredSummaries[selected] ?? null : filteredSummaries.find((t2) => t2.traceId === drilldownTraceId) ?? null;
+  const serviceGraph = react.useMemo(() => buildServiceGraph(spans), [spans]);
+  const topologyLines = react.useMemo(() => renderTopologyAscii(serviceGraph), [serviceGraph]);
   const errorSummaries = react.useMemo(
     () => buildErrorSummaries(traceSummaries),
     [traceSummaries]
@@ -1484,6 +1624,13 @@ Currently viewing trace ${drilldownTraceId}. This trace has ${drilldownSpans.len
         setDrilldownSelectedIndex(0);
         setDrilldownScrollOffset(0);
       }
+      if (input === "G") {
+        setViewMode((m) => m === "topology" ? "trace" : "topology");
+        setSelected(0);
+        setDrilldownTraceId(null);
+        setDrilldownSelectedIndex(0);
+        setDrilldownScrollOffset(0);
+      }
       if (input === "c") {
         setSpans([]);
         setLogs([]);
@@ -1625,7 +1772,7 @@ ${json}
     { isActive: isRawModeSupported }
   );
   const headerRight = recording ? "[Recording]" : paused ? "[Paused]" : "[Live]";
-  const headerModeLabel = viewMode === "trace" ? "traces" : viewMode === "span" ? "spans" : viewMode === "log" ? "logs" : viewMode === "service-summary" ? "services" : "errors";
+  const headerModeLabel = viewMode === "trace" ? "traces" : viewMode === "span" ? "spans" : viewMode === "log" ? "logs" : viewMode === "service-summary" ? "services" : viewMode === "topology" ? "topology" : "errors";
   const showNewError = newErrorCount > 0;
   function renderTreeRow(node, index) {
     const isSel = drilldownTraceId != null && index === drilldownSelectedIndex;
@@ -1639,8 +1786,9 @@ ${json}
         flexDirection: "row",
         children: [
           /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { backgroundColor: isSel ? "blue" : void 0, color: isSel ? "white" : void 0, children: isSel ? "\u25B8 " : "  " }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: node.span.status === "ERROR" ? "red" : void 0, children: node.span.status === "ERROR" ? "\u2717" : " " }),
           /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: prefix }),
-          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: colors ? statusColor : void 0, children: truncate(node.span.name, 24) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: colors ? statusColor : void 0, children: truncate(node.span.name, 23) }),
           /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: svcColor, children: [
             " ",
             truncate(svcName, 10)
@@ -1706,12 +1854,20 @@ ${json}
             ] })
           ] }) : /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", justifyContent: "space-between", children: [
             /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: drilldownTraceId == null ? "\u2191/\u2193 select \u2022 Enter open \u2022 Tab cycle tabs \u2022 Esc back \u2022 T trace \u2022 L logs \u2022 a AI \u2022 ? help" : "\u2191/\u2193 select \u2022 Tab cycle tabs \u2022 Esc back \u2022 T trace \u2022 L logs \u2022 a AI \u2022 ? help" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: viewMode === "trace" ? `traces ${filteredSummaries.length}/${traceSummaries.length}` : viewMode === "span" ? `spans ${filteredSpans.length}/${spans.length}` : viewMode === "service-summary" ? `services ${serviceStats.length}` : viewMode === "errors" ? `errors ${filteredErrorSummaries.length}/${errorSummaries.length}` : `logs ${filteredLogs.length}/${logs.length}` })
+            /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: viewMode === "trace" ? `traces ${filteredSummaries.length}/${traceSummaries.length}` : viewMode === "span" ? `spans ${filteredSpans.length}/${spans.length}` : viewMode === "service-summary" ? `services ${serviceStats.length}` : viewMode === "errors" ? `errors ${filteredErrorSummaries.length}/${errorSummaries.length}` : viewMode === "topology" ? `services ${serviceGraph.services.length} \xB7 edges ${serviceGraph.edges.length}` : `logs ${filteredLogs.length}/${logs.length}` })
           ] }),
-          showHelp && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Views: t/l/v/E \u2022 Search: / \u2022 Filters: e/S/R/H/f/x \u2022 Capture: p/r/J \u2022 AI: a \u2022 Clear: c" })
+          showHelp && /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Views: t/l/v/E/G \u2022 Search: / \u2022 Filters: e/S/R/H/f/x \u2022 Capture: p/r/J \u2022 AI: a \u2022 Clear: c" })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginBottom: 0, children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: spanFilters.serviceName || spanFilters.route || spanFilters.statusGroup !== "all" || spanFilters.traceId ? `filters:${spanFilters.serviceName ? ` service=${spanFilters.serviceName}` : ""}${spanFilters.route ? ` route=${spanFilters.route}` : ""}${spanFilters.statusGroup && spanFilters.statusGroup !== "all" ? ` status=${spanFilters.statusGroup}` : ""}${spanFilters.traceId ? ` trace=${spanFilters.traceId.slice(0, 8)}\u2026` : ""}` : "filters: none" }) }),
-        drilldownTraceId != null ? /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, paddingY: 0, children: [
+        viewMode === "topology" && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { bold: true, children: "Service Topology" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { dimColor: true, children: "Press G to toggle \xB7 Shows service dependencies from span data" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { flexDirection: "column", marginTop: 1, children: topologyLines.map((line, i) => {
+            const hasErr = line.includes(" err");
+            return /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: hasErr ? "red" : void 0, children: line }, `topo-${i}`);
+          }) })
+        ] }),
+        viewMode !== "topology" && (drilldownTraceId != null ? /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, paddingY: 0, children: [
           /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { marginBottom: 0, flexDirection: "column", children: [
             /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, children: [
               "Trace ",
@@ -1810,7 +1966,8 @@ ${json}
                   const svcColor = getServiceColor(svcName);
                   const kindStr = (s.kind ?? "").padEnd(KIND_COL);
                   const svcStr = truncate(svcName, SERVICE_COL - 2).padEnd(SERVICE_COL);
-                  const namePart = `${indent}${truncate(s.name, nameWidth)}`.padEnd(NAME_COL);
+                  const errorMark = s.status === "ERROR" ? "\u2717" : " ";
+                  const namePart = `${indent}${truncate(s.name, nameWidth - 1)}`.padEnd(NAME_COL - 1);
                   const bar = buildWaterfallBar(
                     s.startTime,
                     s.durationMs,
@@ -1821,6 +1978,7 @@ ${json}
                   return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
                     /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { backgroundColor: isSel ? "blue" : void 0, color: isSel ? "white" : void 0, children: [
                       isSel ? "\u25B8" : " ",
+                      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: s.status === "ERROR" ? "red" : void 0, children: errorMark }),
                       namePart
                     ] }),
                     /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: svcColor, children: [
@@ -1927,6 +2085,53 @@ ${json}
                   ": ",
                   truncate(String(v), 28)
                 ] }, k))
+              ] }),
+              span.events && span.events.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginTop: 0, children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, dimColor: true, children: [
+                  "Events (",
+                  span.events.length,
+                  ")"
+                ] }),
+                span.events.slice(0, 5).map((ev, i) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: ev.name === "exception" ? "red" : "yellow", children: [
+                    "  ",
+                    "\u25C6",
+                    " ",
+                    truncate(ev.name, 20)
+                  ] }),
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    "+",
+                    formatDurationMs(ev.timeMs - span.startTime)
+                  ] }),
+                  ev.attributes && Object.keys(ev.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    Object.entries(ev.attributes).slice(0, 2).map(([k, v]) => `${k}=${String(v)}`).join(" ")
+                  ] })
+                ] }, `ev-${i}`))
+              ] }),
+              span.links && span.links.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginTop: 0, children: [
+                /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { bold: true, dimColor: true, children: [
+                  "Links (",
+                  span.links.length,
+                  ")"
+                ] }),
+                span.links.slice(0, 5).map((lnk, i) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "row", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "cyan", children: [
+                    "  ",
+                    "\u2192",
+                    " trace:",
+                    lnk.traceId.slice(0, 8),
+                    "\u2026",
+                    " span:",
+                    lnk.spanId.slice(0, 8),
+                    "\u2026"
+                  ] }),
+                  lnk.attributes && Object.keys(lnk.attributes).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
+                    " ",
+                    Object.entries(lnk.attributes).slice(0, 2).map(([k, v]) => `${k}=${String(v)}`).join(" ")
+                  ] })
+                ] }, `lnk-${i}`))
               ] })
             ] });
           })(),
@@ -2407,7 +2612,7 @@ ${json}
               ] })
             }
           )
-        ] }),
+        ] })),
         showStats && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginTop: 1, borderStyle: "round", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { dimColor: true, children: [
           "Spans: ",
           stats.total,
@@ -2603,6 +2808,8 @@ function* extractSpans(payload) {
   if (!Array.isArray(resourceSpans)) return;
   for (const resourceSpan of resourceSpans) {
     if (!resourceSpan || typeof resourceSpan !== "object") continue;
+    const resource = resourceSpan.resource;
+    const resourceAttrs = attrsToRecord(resource?.attributes);
     const scopeSpans = resourceSpan.scopeSpans;
     if (!Array.isArray(scopeSpans)) continue;
     for (const scopeSpan of scopeSpans) {
@@ -2611,15 +2818,33 @@ function* extractSpans(payload) {
       if (!Array.isArray(spans)) continue;
       for (const span of spans) {
         if (span && typeof span === "object") {
-          yield span;
+          yield { span, resourceAttrs };
         }
       }
     }
   }
 }
-function otlpSpanToTerminalEvent(span) {
+function otlpSpanToTerminalEvent(span, resourceAttrs = {}) {
   const startTime = toMs(span.startTimeUnixNano);
   const endTime = toMs(span.endTimeUnixNano);
+  const spanAttrs = attrsToRecord(span.attributes);
+  const mergedAttrs = {};
+  for (const [k, v] of Object.entries(resourceAttrs)) {
+    mergedAttrs[k] = v;
+  }
+  for (const [k, v] of Object.entries(spanAttrs)) {
+    mergedAttrs[k] = v;
+  }
+  const parsedEvents = span.events?.length ? span.events.map((e) => ({
+    name: e.name || "",
+    timeMs: toMs(e.timeUnixNano),
+    attributes: attrsToRecord(e.attributes)
+  })) : void 0;
+  const parsedLinks = span.links?.length ? span.links.map((l) => ({
+    traceId: normalizeHexId(l.traceId, 32),
+    spanId: normalizeHexId(l.spanId, 16),
+    attributes: attrsToRecord(l.attributes)
+  })) : void 0;
   return {
     name: span.name || "unnamed",
     spanId: normalizeHexId(span.spanId, 16),
@@ -2630,7 +2855,9 @@ function otlpSpanToTerminalEvent(span) {
     durationMs: Math.max(0, endTime - startTime),
     status: mapStatus2(span.status?.code),
     kind: mapKind2(span.kind),
-    attributes: attrsToRecord(span.attributes)
+    attributes: mergedAttrs,
+    ...parsedEvents ? { events: parsedEvents } : {},
+    ...parsedLinks ? { links: parsedLinks } : {}
   };
 }
 async function readJsonBody(req) {
@@ -2655,8 +2882,8 @@ function sendJson(res, status, data) {
 }
 function parseOtlpEvents(payload) {
   const events = [];
-  for (const span of extractSpans(payload)) {
-    events.push(otlpSpanToTerminalEvent(span));
+  for (const { span, resourceAttrs } of extractSpans(payload)) {
+    events.push(otlpSpanToTerminalEvent(span, resourceAttrs));
   }
   return events;
 }