@timber-js/app 0.2.0-alpha.238 → 0.2.0-alpha.239
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/dev-span-RsVeYYc_.js.map +1 -1
- package/dist/dev-tools/instrumentation.d.ts.map +1 -1
- package/dist/dev-tools/log-columns.d.ts +50 -0
- package/dist/dev-tools/log-columns.d.ts.map +1 -0
- package/dist/dev-tools/logger.d.ts +5 -0
- package/dist/dev-tools/logger.d.ts.map +1 -1
- package/dist/native/rsc/dev-tools/instrumentation.js +5 -1
- package/dist/native/rsc/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/rsc/dev-tools/log-columns.js +69 -0
- package/dist/native/rsc/dev-tools/log-columns.js.map +1 -0
- package/dist/native/rsc/dev-tools/logger.js +60 -33
- package/dist/native/rsc/dev-tools/logger.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/shared/dev-span.js +5 -2
- package/dist/native/rsc/shared/dev-span.js.map +1 -1
- package/dist/native/rsc/shared/span-waterfall.js +13 -2
- package/dist/native/rsc/shared/span-waterfall.js.map +1 -1
- package/dist/native/ssr/dev-tools/instrumentation.js +5 -1
- package/dist/native/ssr/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/ssr/dev-tools/log-columns.js +69 -0
- package/dist/native/ssr/dev-tools/log-columns.js.map +1 -0
- package/dist/native/ssr/dev-tools/logger.js +60 -33
- package/dist/native/ssr/dev-tools/logger.js.map +1 -1
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/shared/dev-span.js +5 -2
- package/dist/native/ssr/shared/dev-span.js.map +1 -1
- package/dist/native/ssr/shared/span-waterfall.js +13 -2
- package/dist/native/ssr/shared/span-waterfall.js.map +1 -1
- package/dist/shared/dev-span.d.ts +6 -0
- package/dist/shared/dev-span.d.ts.map +1 -1
- package/dist/shared/span-waterfall.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/dev-tools/instrumentation.ts +4 -1
- package/src/dev-tools/log-columns.ts +156 -0
- package/src/dev-tools/logger.ts +107 -63
- package/src/shared/dev-span.ts +13 -1
- package/src/shared/span-waterfall.ts +36 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","names":[],"sources":["../../../../src/dev-tools/instrumentation.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"instrumentation.js","names":[],"sources":["../../../../src/dev-tools/instrumentation.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// src/dev-tools/log-columns.ts
|
|
2
|
+
var ESCAPE = /\x1b\[[0-9;]*m|\x1b\]8;;[^\x07]*\x07/y;
|
|
3
|
+
var RESET = "\x1B[0m";
|
|
4
|
+
var ZERO_WIDTH = /^[\p{Mn}\p{Me}\p{Cf}]$/u;
|
|
5
|
+
function cellWidth(codePoint, char) {
|
|
6
|
+
if (ZERO_WIDTH.test(char)) return 0;
|
|
7
|
+
return codePoint >= 4352 && codePoint <= 4447 || codePoint >= 11904 && codePoint <= 42191 && codePoint !== 12351 || codePoint >= 44032 && codePoint <= 55203 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65072 && codePoint <= 65103 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127744 && codePoint <= 129791 || codePoint >= 131072 && codePoint <= 262141 ? 2 : 1;
|
|
8
|
+
}
|
|
9
|
+
function visibleWidth(text) {
|
|
10
|
+
let width = 0;
|
|
11
|
+
for (let i = 0; i < text.length;) {
|
|
12
|
+
ESCAPE.lastIndex = i;
|
|
13
|
+
const escape = ESCAPE.exec(text);
|
|
14
|
+
if (escape) {
|
|
15
|
+
i += escape[0].length;
|
|
16
|
+
continue;
|
|
17
|
+
}
|
|
18
|
+
const codePoint = text.codePointAt(i) ?? 0;
|
|
19
|
+
const char = String.fromCodePoint(codePoint);
|
|
20
|
+
i += char.length;
|
|
21
|
+
width += cellWidth(codePoint, char);
|
|
22
|
+
}
|
|
23
|
+
return width;
|
|
24
|
+
}
|
|
25
|
+
function fitToWidth(line, columns) {
|
|
26
|
+
if (columns === void 0 || columns < 2 || visibleWidth(line) <= columns) return line;
|
|
27
|
+
let out = "";
|
|
28
|
+
let width = 0;
|
|
29
|
+
let styled = false;
|
|
30
|
+
for (let i = 0; i < line.length;) {
|
|
31
|
+
ESCAPE.lastIndex = i;
|
|
32
|
+
const escape = ESCAPE.exec(line);
|
|
33
|
+
if (escape) {
|
|
34
|
+
out += escape[0];
|
|
35
|
+
styled = escape[0] !== RESET;
|
|
36
|
+
i += escape[0].length;
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const codePoint = line.codePointAt(i) ?? 0;
|
|
40
|
+
const char = String.fromCodePoint(codePoint);
|
|
41
|
+
const cells = cellWidth(codePoint, char);
|
|
42
|
+
if (width + cells > columns - 1) break;
|
|
43
|
+
out += char;
|
|
44
|
+
i += char.length;
|
|
45
|
+
width += cells;
|
|
46
|
+
}
|
|
47
|
+
return `${out}…${styled ? RESET : ""}`;
|
|
48
|
+
}
|
|
49
|
+
var MIN_HEAD = 12;
|
|
50
|
+
function fitParts(head, tail, columns) {
|
|
51
|
+
const line = head + tail;
|
|
52
|
+
if (columns === void 0 || visibleWidth(line) <= columns) return line;
|
|
53
|
+
const budget = columns - visibleWidth(tail);
|
|
54
|
+
return budget >= MIN_HEAD ? fitToWidth(head, budget) + tail : fitToWidth(line, columns);
|
|
55
|
+
}
|
|
56
|
+
function renderColumns(rows, columns, styles) {
|
|
57
|
+
const ms = (value) => value === void 0 ? "" : `${value}ms`;
|
|
58
|
+
const startWidth = Math.max(5, ...rows.map((r) => ms(r.startMs).length));
|
|
59
|
+
const durWidth = Math.max(3, ...rows.map((r) => ms(r.durationMs).length));
|
|
60
|
+
const header = `${"start".padStart(startWidth)} ${"dur".padStart(durWidth)}`;
|
|
61
|
+
return [fitToWidth(styles.dim(header), columns), ...rows.map((r) => {
|
|
62
|
+
const start = styles.dim(ms(r.startMs).padStart(startWidth));
|
|
63
|
+
const dur = ms(r.durationMs).padStart(durWidth);
|
|
64
|
+
return fitParts(`${start} ${r.slow ? styles.slow(dur) : dur} ${r.text}`, r.tail ?? "", columns);
|
|
65
|
+
})];
|
|
66
|
+
}
|
|
67
|
+
export { fitParts, fitToWidth, renderColumns, visibleWidth };
|
|
68
|
+
|
|
69
|
+
//# sourceMappingURL=log-columns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-columns.js","names":[],"sources":["../../../../src/dev-tools/log-columns.ts"],"mappings":";AAWA,IAAM,SAAS;AACf,IAAM,QAAQ;AAGd,IAAM,aAAa;AAUnB,SAAS,UAAU,WAAmB,MAAsB;CAC1D,IAAI,WAAW,KAAK,IAAI,GAAG,OAAO;CAWlC,OATG,aAAa,QAAU,aAAa,QACpC,aAAa,SAAU,aAAa,SAAU,cAAc,SAC5D,aAAa,SAAU,aAAa,SACpC,aAAa,SAAU,aAAa,SACpC,aAAa,SAAU,aAAa,SACpC,aAAa,SAAU,aAAa,SACpC,aAAa,SAAU,aAAa,SACpC,aAAa,UAAW,aAAa,UACrC,aAAa,UAAW,aAAa,SAC1B,IAAI;AACpB;AAGA,SAAgB,aAAa,MAAsB;CACjD,IAAI,QAAQ;CACZ,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,SAAS;EAChC,OAAO,YAAY;EACnB,MAAM,SAAS,OAAO,KAAK,IAAI;EAC/B,IAAI,QAAQ;GACV,KAAK,OAAO,EAAE,CAAC;GACf;EACF;EACA,MAAM,YAAY,KAAK,YAAY,CAAC,KAAK;EACzC,MAAM,OAAO,OAAO,cAAc,SAAS;EAC3C,KAAK,KAAK;EACV,SAAS,UAAU,WAAW,IAAI;CACpC;CACA,OAAO;AACT;AAQA,SAAgB,WAAW,MAAc,SAAqC;CAC5E,IAAI,YAAY,UAAa,UAAU,KAAK,aAAa,IAAI,KAAK,SAAS,OAAO;CAClF,IAAI,MAAM;CACV,IAAI,QAAQ;CACZ,IAAI,SAAS;CACb,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,SAAS;EAChC,OAAO,YAAY;EACnB,MAAM,SAAS,OAAO,KAAK,IAAI;EAC/B,IAAI,QAAQ;GACV,OAAO,OAAO;GACd,SAAS,OAAO,OAAO;GACvB,KAAK,OAAO,EAAE,CAAC;GACf;EACF;EACA,MAAM,YAAY,KAAK,YAAY,CAAC,KAAK;EACzC,MAAM,OAAO,OAAO,cAAc,SAAS;EAC3C,MAAM,QAAQ,UAAU,WAAW,IAAI;EAEvC,IAAI,QAAQ,QAAQ,UAAU,GAAG;EACjC,OAAO;EACP,KAAK,KAAK;EACV,SAAS;CACX;CACA,OAAO,GAAG,IAAI,GAAG,SAAS,QAAQ;AACpC;AAMA,IAAM,WAAW;AASjB,SAAgB,SAAS,MAAc,MAAc,SAAqC;CACxF,MAAM,OAAO,OAAO;CACpB,IAAI,YAAY,UAAa,aAAa,IAAI,KAAK,SAAS,OAAO;CACnE,MAAM,SAAS,UAAU,aAAa,IAAI;CAC1C,OAAO,UAAU,WAAW,WAAW,MAAM,MAAM,IAAI,OAAO,WAAW,MAAM,OAAO;AACxF;AA0BA,SAAgB,cACd,MACA,SACA,QACU;CACV,MAAM,MAAM,UAA+B,UAAU,SAAY,KAAK,GAAG,MAAM;CAC/E,MAAM,aAAa,KAAK,IAAI,GAAgB,GAAG,KAAK,KAAK,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC;CACpF,MAAM,WAAW,KAAK,IAAI,GAAc,GAAG,KAAK,KAAK,MAAM,GAAG,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC;CACnF,MAAM,SAAS,GAAG,QAAQ,SAAS,UAAU,EAAE,IAAI,MAAM,SAAS,QAAQ;CAC1E,OAAO,CACL,WAAW,OAAO,IAAI,MAAM,GAAG,OAAO,GACtC,GAAG,KAAK,KAAK,MAAM;EACjB,MAAM,QAAQ,OAAO,IAAI,GAAG,EAAE,OAAO,CAAC,CAAC,SAAS,UAAU,CAAC;EAC3D,MAAM,MAAM,GAAG,EAAE,UAAU,CAAC,CAAC,SAAS,QAAQ;EAC9C,OAAO,SACL,GAAG,MAAM,IAAI,EAAE,OAAO,OAAO,KAAK,GAAG,IAAI,IAAI,IAAI,EAAE,QACnD,EAAE,QAAQ,IACV,OACF;CACF,CAAC,CACH;AACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { FETCH_BODY_SPAN_NAME, ROOT_SPAN_NAME, devSpanLabel } from "../shared/dev-span.js";
|
|
1
|
+
import { FETCH_BODY_SPAN_NAME, ROOT_SPAN_NAME, devSpanLabel, fetchDisplayUrl } from "../shared/dev-span.js";
|
|
2
2
|
import { buildWaterfall } from "../shared/span-waterfall.js";
|
|
3
|
+
import { fitParts, renderColumns } from "./log-columns.js";
|
|
3
4
|
import { STATUS_CODES } from "node:http";
|
|
4
5
|
import { styleText } from "node:util";
|
|
5
6
|
// src/dev-tools/logger.ts
|
|
@@ -107,13 +108,15 @@ function formatSpanTree(spans, config) {
|
|
|
107
108
|
const path = String(root.attributes["url.path"] ?? "/");
|
|
108
109
|
const traceId = root.spanContext().traceId;
|
|
109
110
|
const actionName = root.attributes["timber.action_name"];
|
|
110
|
-
const dimTrace = style("dim", `trace_id: ${traceId}`)
|
|
111
|
+
const dimTrace = ` ${style("dim", `trace_id: ${traceId}`)}`;
|
|
111
112
|
if (actionName) {
|
|
112
113
|
const actionFile = root.attributes["timber.action_file"];
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
const action = `ACTION ${actionName}${actionFile ? ` (${actionFile})` : ""}`;
|
|
115
|
+
lines.push(fitParts(style("bold", action), dimTrace, config?.columns));
|
|
116
|
+
} else lines.push(fitParts(`${colorMethod(method)} ${style("bold", path)}`, dimTrace, config?.columns));
|
|
115
117
|
const body = rows.filter((r) => r.span.span !== root);
|
|
116
|
-
|
|
118
|
+
const tree = [];
|
|
119
|
+
for (const { item, prefix, connector } of treeConnectors(body, (r) => r.depth - 1)) formatRow(item, tree, prefix, connector, bodies, slowPhaseMs, rootStart);
|
|
117
120
|
const status = root.attributes["http.response.status_code"] ?? (root.status.code === 2 ? 500 : 200);
|
|
118
121
|
const totalMs = Math.round(hrTimeToMs(root.duration));
|
|
119
122
|
const statusFmt = status < 400 ? "green" : status < 500 ? "yellow" : "red";
|
|
@@ -123,26 +126,38 @@ function formatSpanTree(spans, config) {
|
|
|
123
126
|
const folded = body.reduce((n, r) => n + r.folded.length, 0);
|
|
124
127
|
const omitted = [hiddenWaits > 0 ? `${hiddenWaits} wait${hiddenWaits === 1 ? "" : "s"} hidden` : "", folded > 0 ? `${folded} await${folded === 1 ? "" : "s"} folded` : ""].filter(Boolean);
|
|
125
128
|
const omittedNote = omitted.length > 0 ? style("dim", ` · ${omitted.join(", ")} (TIMBER_DEV_LOG=verbose)`) : "";
|
|
126
|
-
|
|
129
|
+
tree.push({
|
|
130
|
+
durationMs: totalMs,
|
|
131
|
+
text: style(statusFmt, `✓ ${statusText}`),
|
|
132
|
+
tail: `${denyNote}${omittedNote}`
|
|
133
|
+
});
|
|
134
|
+
lines.push(...renderColumns(tree, config?.columns, {
|
|
135
|
+
dim: (text) => style("dim", text),
|
|
136
|
+
slow: (text) => style("yellow", text)
|
|
137
|
+
}));
|
|
127
138
|
return lines.join("\n") + "\n";
|
|
128
139
|
}
|
|
129
|
-
function
|
|
140
|
+
function formatFetchParts(span, timing) {
|
|
130
141
|
const method = String(span.attributes["http.request.method"] ?? "GET");
|
|
131
|
-
const url = String(span.attributes["http.url"] ?? "");
|
|
142
|
+
const url = fetchDisplayUrl(String(span.attributes["http.url"] ?? ""));
|
|
132
143
|
const statusCode = span.attributes["http.response.status_code"];
|
|
133
144
|
const cacheStatus = span.attributes["timber.cache_status"];
|
|
134
145
|
const fetchError = span.attributes["timber.fetch_error"];
|
|
135
146
|
const isError = span.status.code === 2;
|
|
136
|
-
const {
|
|
137
|
-
const
|
|
138
|
-
let
|
|
139
|
-
|
|
140
|
-
if (
|
|
147
|
+
const { headersMs, bodyMs, rowMs } = timing;
|
|
148
|
+
const head = `${style("dim", `fetch ${method}`)} ${url}`;
|
|
149
|
+
let text = "";
|
|
150
|
+
if (bodyMs > 0) text += ` ${style("dim", `(${headersMs}ms + ${bodyMs}ms body)`)}`;
|
|
151
|
+
else if (headersMs !== rowMs) text += ` ${style("dim", `(${headersMs}ms)`)}`;
|
|
152
|
+
if (cacheStatus) text += ` ${style("dim", `[cdn: ${cacheStatus}]`)}`;
|
|
141
153
|
if (isError) {
|
|
142
154
|
const errMsg = fetchError ? `: ${fetchError}` : "";
|
|
143
|
-
|
|
144
|
-
} else if (statusCode && statusCode >= 400)
|
|
145
|
-
return
|
|
155
|
+
text += ` ${style("red", `ERROR${errMsg}`)}`;
|
|
156
|
+
} else if (statusCode && statusCode >= 400) text += ` ${style("yellow", String(statusCode))}`;
|
|
157
|
+
return {
|
|
158
|
+
head,
|
|
159
|
+
tail: text
|
|
160
|
+
};
|
|
146
161
|
}
|
|
147
162
|
function accessOutcome(span) {
|
|
148
163
|
const result = span.attributes["timber.result"];
|
|
@@ -158,31 +173,43 @@ function formatRow(row, lines, prefix, connector, bodies, slowPhaseMs, rootStart
|
|
|
158
173
|
const leaf = row.folded.at(-1);
|
|
159
174
|
const startMs = Math.round(relativeMs(outer.startTime, rootStart));
|
|
160
175
|
const endMs = Math.round(relativeMs(outer.endTime, rootStart));
|
|
161
|
-
const durationMs = endMs - startMs;
|
|
162
|
-
const slow = (text) => durationMs > slowPhaseMs ? style("yellow", text) : text;
|
|
163
176
|
const envTag = (span) => `${style("cyan", `[${devSpanLabel(span.name, span.attributes).env}]`)} `;
|
|
164
|
-
const
|
|
165
|
-
const lead = `${prefix}${connector} ${frame}`;
|
|
177
|
+
const named = (span) => `${span.name === "timber.await" ? "" : envTag(span)}${devSpanLabel(span.name, span.attributes).label}`;
|
|
166
178
|
const outcome = accessOutcome(outer);
|
|
179
|
+
const lead = `${prefix}${connector} `;
|
|
167
180
|
if (leaf?.name === "timber.fetch" || outer.name === "timber.fetch") {
|
|
168
181
|
const fetch = leaf?.name === "timber.fetch" ? leaf : row.span;
|
|
169
182
|
const reads = bodies.get(fetch.spanId) ?? [];
|
|
170
183
|
const bodyMs = Math.round(reads.reduce((ms, r) => ms + (r.endMs - r.startMs), 0));
|
|
171
|
-
const
|
|
172
|
-
const end =
|
|
173
|
-
const
|
|
184
|
+
const lastReadEnd = reads.reduce((end, r) => Math.max(end, r.endMs), -Infinity);
|
|
185
|
+
const end = lastReadEnd > -Infinity ? Math.max(endMs, Math.round(lastReadEnd - hrTimeToMs(rootStart))) : endMs;
|
|
186
|
+
const fetchStart = Math.round(relativeMs(fetch.span.startTime, rootStart));
|
|
187
|
+
const fetchEnd = Math.round(relativeMs(fetch.span.endTime, rootStart));
|
|
188
|
+
const fetchParts = formatFetchParts(fetch.span, {
|
|
189
|
+
headersMs: fetchEnd - fetchStart,
|
|
190
|
+
bodyMs,
|
|
191
|
+
rowMs: end - startMs
|
|
192
|
+
});
|
|
193
|
+
const askerName = named(outer);
|
|
194
|
+
const asker = row.folded.length > 0 && !askerName.startsWith("await fetch(") ? `${askerName} → ` : "";
|
|
195
|
+
lines.push({
|
|
174
196
|
startMs,
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
197
|
+
durationMs: end - startMs,
|
|
198
|
+
slow: end - startMs > slowPhaseMs,
|
|
199
|
+
text: `${lead}${asker}${fetchParts.head}`,
|
|
200
|
+
tail: `${fetchParts.tail}${outcome ? style("dim", outcome) : ""}`
|
|
178
201
|
});
|
|
179
|
-
lines.push(outcome ? `${fetchLine}${style("dim", outcome)}` : fetchLine);
|
|
180
202
|
} else {
|
|
181
|
-
const
|
|
182
|
-
const
|
|
183
|
-
const
|
|
184
|
-
|
|
185
|
-
|
|
203
|
+
const first = row.folded[0]?.span;
|
|
204
|
+
const frame = outer.name !== "timber.await" && first ? `${named(outer)} → ` : "";
|
|
205
|
+
const label = frame && first ? named(first) : named(outer);
|
|
206
|
+
lines.push({
|
|
207
|
+
startMs,
|
|
208
|
+
durationMs: endMs - startMs,
|
|
209
|
+
slow: endMs - startMs > slowPhaseMs,
|
|
210
|
+
text: `${lead}${frame}${label}`,
|
|
211
|
+
tail: outcome ? style("dim", outcome) : ""
|
|
212
|
+
});
|
|
186
213
|
}
|
|
187
214
|
for (const { span } of chain) for (const event of span.events) {
|
|
188
215
|
if (event.name !== "timber.cache.hit" && event.name !== "timber.cache.miss") continue;
|
|
@@ -191,7 +218,7 @@ function formatRow(row, lines, prefix, connector, bodies, slowPhaseMs, rootStart
|
|
|
191
218
|
const durMs = event.attributes?.["duration_ms"];
|
|
192
219
|
const durStr = durMs !== void 0 ? ` ${durMs < 1 ? "<1" : Math.round(durMs)}ms` : "";
|
|
193
220
|
const stale = event.attributes?.["stale"] ? " (stale)" : "";
|
|
194
|
-
lines.push(`${childPrefix}${style("dim", `└── ${key} timber.cache ${hitMiss}${durStr}${stale}`)}`);
|
|
221
|
+
lines.push({ text: `${childPrefix}${style("dim", `└── ${key} timber.cache ${hitMiss}${durStr}${stale}`)}` });
|
|
195
222
|
}
|
|
196
223
|
}
|
|
197
224
|
function formatSpanSummary(spans, _config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/dev-tools/logger.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/dev-tools/logger.ts"],"mappings":"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"}
|
|
@@ -91,6 +91,7 @@
|
|
|
91
91
|
"cookies/validation.ts": "cookies/validation.js",
|
|
92
92
|
"dev-tools/await-span.ts": "dev-tools/await-span.js",
|
|
93
93
|
"dev-tools/instrumentation.ts": "dev-tools/instrumentation.js",
|
|
94
|
+
"dev-tools/log-columns.ts": "dev-tools/log-columns.js",
|
|
94
95
|
"dev-tools/logger.ts": "dev-tools/logger.js",
|
|
95
96
|
"dev-tools/span-sink.ts": "dev-tools/span-sink.js",
|
|
96
97
|
"params/codec-registry.ts": "params/codec-registry.js",
|
|
@@ -31,6 +31,9 @@ function slotPrefix(attrs) {
|
|
|
31
31
|
const slot = attrs["timber.slot"];
|
|
32
32
|
return slot ? `${String(slot)} ` : "";
|
|
33
33
|
}
|
|
34
|
+
function fetchDisplayUrl(url) {
|
|
35
|
+
return url.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "");
|
|
36
|
+
}
|
|
34
37
|
function devSpanLabel(name, attrs) {
|
|
35
38
|
switch (name) {
|
|
36
39
|
case ROOT_SPAN_NAME: {
|
|
@@ -101,7 +104,7 @@ function devSpanLabel(name, attrs) {
|
|
|
101
104
|
const fetchMethod = attrs["http.request.method"] ?? "GET";
|
|
102
105
|
const fetchUrl = attrs["http.url"] ?? "";
|
|
103
106
|
return {
|
|
104
|
-
label: `fetch ${String(fetchMethod)} ${String(fetchUrl)}`,
|
|
107
|
+
label: `fetch ${String(fetchMethod)} ${fetchDisplayUrl(String(fetchUrl))}`,
|
|
105
108
|
env: "fetch"
|
|
106
109
|
};
|
|
107
110
|
}
|
|
@@ -111,6 +114,6 @@ function devSpanLabel(name, attrs) {
|
|
|
111
114
|
};
|
|
112
115
|
}
|
|
113
116
|
}
|
|
114
|
-
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, FETCH_BODY_SPAN_NAME, FETCH_SPAN_NAME, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
117
|
+
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, FETCH_BODY_SPAN_NAME, FETCH_SPAN_NAME, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, fetchDisplayUrl, traceTimingEntry };
|
|
115
118
|
|
|
116
119
|
//# sourceMappingURL=dev-span.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAWA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,kBAAkB;AAO/B,IAAa,uBAAuB;AAGpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,sBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAQ;EAChD,KAAK,iBAAiB;GACpB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;
|
|
1
|
+
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAWA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,kBAAkB;AAO/B,IAAa,uBAAuB;AAGpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,gBAAgB,KAAqB;CACnD,OAAO,IAAI,QAAQ,4BAA4B,EAAE;AACnD;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,sBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAQ;EAChD,KAAK,iBAAiB;GACpB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;IACL,OAAO,SAAS,OAAO,WAAW,EAAE,GAAG,gBAAgB,OAAO,QAAQ,CAAC;IACvE,KAAK;GACP;EACF;EACA,SACE,OAAO;GAAE,OAAO;GAAM,KAAK;EAAM;CACrC;AACF"}
|
|
@@ -56,14 +56,25 @@ function buildWaterfall(spans, { ioOnly = false, skip, hideWaits = false, fold =
|
|
|
56
56
|
const waits = explainedWaits(spans);
|
|
57
57
|
const kept = (s) => (!ioOnly || IO_SPANS.has(s.name)) && !skip?.(s);
|
|
58
58
|
const hidden = (s) => hideWaits && waits.has(s.spanId);
|
|
59
|
-
const
|
|
59
|
+
const shownUnder = (parent) => (children.get(parent) ?? []).flatMap((s) => hidden(s) ? [] : kept(s) ? [s] : shownUnder(s.spanId));
|
|
60
|
+
const visibleChildren = (parent) => shownUnder(parent).sort((a, b) => a.startMs - b.startMs);
|
|
61
|
+
const ioEnds = new Map();
|
|
62
|
+
const ioEnd = (span) => {
|
|
63
|
+
let end = ioEnds.get(span.spanId);
|
|
64
|
+
if (end === void 0) {
|
|
65
|
+
const io = (children.get(span.spanId) ?? []).filter((kid) => IO_SPANS.has(kid.name) && kid.attributes["timber.await_wait"] !== true);
|
|
66
|
+
end = Math.max(span.endMs, ...io.map(ioEnd));
|
|
67
|
+
ioEnds.set(span.spanId, end);
|
|
68
|
+
}
|
|
69
|
+
return end;
|
|
70
|
+
};
|
|
60
71
|
const origin = Math.min(...spans.map((s) => s.startMs));
|
|
61
72
|
const rows = [];
|
|
62
73
|
const emit = (span, depth) => {
|
|
63
74
|
const folded = [];
|
|
64
75
|
let tail = span;
|
|
65
76
|
let kids = visibleChildren(tail.spanId);
|
|
66
|
-
const foldable = (kid) => kid !== void 0 && !waits.has(kid.spanId) && (tail.name === "timber.await" || kid.name === "timber.await" && !IO_SPANS.has(tail.name)) && kid.startMs >= tail.startMs && kid.endMs <= tail.endMs &&
|
|
77
|
+
const foldable = (kid) => kid !== void 0 && !waits.has(kid.spanId) && (tail.name === "timber.await" || kid.name === "timber.await" && !IO_SPANS.has(tail.name)) && kid.startMs >= tail.startMs && kid.endMs <= tail.endMs && Math.min(ioEnd(kid), tail.endMs) - kid.startMs >= FOLD_COVERAGE * duration(tail);
|
|
67
78
|
if (fold && !expanded.has(span.spanId)) for (let only = kids.length === 1 ? kids[0] : void 0; foldable(only); only = kids.length === 1 ? kids[0] : void 0) {
|
|
68
79
|
tail = only;
|
|
69
80
|
folded.push(tail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"span-waterfall.js","names":[],"sources":["../../../../src/shared/span-waterfall.ts"],"mappings":";;AAqBA,IAAM,WAAW,IAAI,IAAI;CAAC;CAAiB;CAAiB;AAAoB,CAAC;AAMjF,IAAM,gBAAgB;AAMtB,IAAM,gBAAgB;AAgDtB,IAAM,YAAY,MAAqB,EAAE,QAAQ,EAAE;AAGnD,SAAS,YAAY,WAA4C;CAC/D,IAAI,QAAQ;CACZ,IAAI,QAAQ;CACZ,KAAK,MAAM,CAAC,OAAO,QAAQ,UAAU,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG;EAChE,IAAI,OAAO,OAAO;EAClB,SAAS,MAAM,KAAK,IAAI,OAAO,KAAK;EACpC,QAAQ;CACV;CACA,OAAO;AACT;AAeA,SAAgB,eAAe,OAA8C;CAC3E,MAAM,OAAO,IAAI,IAAI,MAAM,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;CACpD,MAAM,UAAU,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,YAAY,CAAC;CACxD,MAAM,eAAe,MACnB,EAAE,WAAA,yBAAqC,QAAQ,CAAC,QAAQ,IAAI,EAAE,MAAM;CACtE,MAAM,OAAO,MAAM,QAAQ,MAAM,SAAS,IAAI,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;CACxE,MAAM,YAAY,IAAI,IAAY;CAClC,KAAK,MAAM,QAAQ,OAAO;EACxB,IAAI,CAAC,YAAY,IAAI,KAAK,SAAS,IAAI,KAAK,GAAG;EAC/C,MAAM,YAAY,IAAI,IAAY;EAClC,KAAK,IAAI,IAAI,KAAK,cAAc,KAAK,CAAC,UAAU,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,EAAE,cACvE,UAAU,IAAI,CAAC;EAEjB,MAAM,WAAoC,CAAC;EAC3C,KAAK,MAAM,KAAK,MAAM;GACpB,IAAI,UAAU,IAAI,EAAE,MAAM,GAAG;GAC7B,MAAM,QAAQ,KAAK,IAAI,EAAE,SAAS,KAAK,OAAO;GAC9C,MAAM,MAAM,KAAK,IAAI,EAAE,OAAO,KAAK,KAAK;GACxC,IAAI,MAAM,OAAO,SAAS,KAAK,CAAC,OAAO,GAAG,CAAC;EAC7C;EACA,IAAI,YAAY,QAAQ,KAAK,gBAAgB,SAAS,IAAI,GAAG,UAAU,IAAI,KAAK,MAAM;CACxF;CACA,OAAO;AACT;AAoBA,SAAgB,eACd,OACA,EACE,SAAS,OACT,MACA,YAAY,OACZ,OAAO,OACP,WAAW,IAAI,IAAY,MACJ,CAAC,GACZ;CACd,IAAI,MAAM,WAAW,GAAG,OAAO;EAAE,MAAM,CAAC;EAAG,aAAa;CAAE;CAC1D,MAAM,MAAM,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,MAAM,CAAC;CAC9C,MAAM,WAAW,IAAI,IAA6B;CAClD,KAAK,MAAM,QAAQ,OAAO;EAGxB,MAAM,SAAS,KAAK,gBAAgB,IAAI,IAAI,KAAK,YAAY,IAAI,KAAK,eAAe;EACrF,MAAM,WAAW,SAAS,IAAI,MAAM,KAAK,CAAC;EAC1C,SAAS,KAAK,IAAI;EAClB,SAAS,IAAI,QAAQ,QAAQ;CAC/B;CACA,KAAK,MAAM,YAAY,SAAS,OAAO,GAAG,SAAS,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO;CAEvF,MAAM,QAAQ,eAAe,KAAK;CAClC,MAAM,QAAQ,OAAU,CAAC,UAAU,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC;CACrE,MAAM,UAAU,MAAS,aAAa,MAAM,IAAI,EAAE,MAAM;CAGxD,MAAM,
|
|
1
|
+
{"version":3,"file":"span-waterfall.js","names":[],"sources":["../../../../src/shared/span-waterfall.ts"],"mappings":"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"}
|
|
@@ -104,6 +104,12 @@ export declare function traceIdFromServerTiming(timing: string | null | readonly
|
|
|
104
104
|
export declare function traceTimingEntry(traceId: string): string;
|
|
105
105
|
/** Span attributes as either side holds them (OTEL also allows arrays). */
|
|
106
106
|
type SpanAttributes = Readonly<Record<string, unknown>>;
|
|
107
|
+
/**
|
|
108
|
+
* A fetch URL as the terminal tree and the pill show it: without its scheme,
|
|
109
|
+
* which is `https://` for nearly every fetch and only makes the line longer
|
|
110
|
+
* (TIM-1631).
|
|
111
|
+
*/
|
|
112
|
+
export declare function fetchDisplayUrl(url: string): string;
|
|
107
113
|
/**
|
|
108
114
|
* Map a span to its display label and environment tag. One mapping for the
|
|
109
115
|
* terminal tree and the dev request pill, so the two never name a span
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.d.ts","sourceRoot":"","sources":["../../src/shared/dev-span.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAE5C,uFAAuF;AACvF,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,eAAqC,CAAC;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eAAiC,CAAC;AAE5D,yDAAyD;AACzD,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,+EAA+E;AAC/E,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD,2CAA2C;AAC3C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YAC9B,qBAAqB,EACrB,2BAA2B;AAC3B,mCAAmC;AACnC,UAAU;AACV,mCAAmC;AACnC,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,qBAAqB;AACrB,6EAA6E;AAC7E,oBAAoB;AACpB,oDAAoD;AACpD,uBAAuB;AACvB,kCAAkC;AAClC,mBAAmB,CACX,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,kEAAkE;AAClE,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,gBAAgB,CAGhE,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;AAEzD,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,kEAAkE;IAClE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IACzE,gEAAgE;IAChE,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EAAE,GACvE,MAAM,GAAG,IAAI,CAUf;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAID,2EAA2E;AAC3E,KAAK,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAQxD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"dev-span.d.ts","sourceRoot":"","sources":["../../src/shared/dev-span.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAE5C,uFAAuF;AACvF,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAE1D;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,eAAqC,CAAC;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eAAiC,CAAC;AAE5D,yDAAyD;AACzD,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,+EAA+E;AAC/E,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,sBAAsB,CAAC;AAExD,2CAA2C;AAC3C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YAC9B,qBAAqB,EACrB,2BAA2B;AAC3B,mCAAmC;AACnC,UAAU;AACV,mCAAmC;AACnC,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,oBAAoB,EACpB,qBAAqB;AACrB,6EAA6E;AAC7E,oBAAoB;AACpB,oDAAoD;AACpD,uBAAuB;AACvB,kCAAkC;AAClC,mBAAmB,CACX,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,kEAAkE;AAClE,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,gBAAgB,CAGhE,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;AAEzD,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,kEAAkE;IAClE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IACzE,gEAAgE;IAChE,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EAAE,GACvE,MAAM,GAAG,IAAI,CAUf;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAID,2EAA2E;AAC3E,KAAK,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAQxD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAoDhG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"span-waterfall.d.ts","sourceRoot":"","sources":["../../src/shared/span-waterfall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAwBH;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa;IACvE,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oEAAoE;IACpE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;IAC5B,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uDAAuD;IACvD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,sDAAsD;IACtD,QAAQ,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,aAAa;IACnD,kEAAkE;IAClE,IAAI,EAAE,CAAC,CAAC;IACR,8EAA8E;IAC9E,MAAM,EAAE,CAAC,EAAE,CAAC;IACZ,4DAA4D;IAC5D,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,aAAa;IAChD,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACxB,0CAA0C;IAC1C,WAAW,EAAE,MAAM,CAAC;CACrB;AAgBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAuB3E;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,aAAa,EACpD,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,EACE,MAAc,EACd,IAAI,EACJ,SAAiB,EACjB,IAAY,EACZ,QAA4B,GAC7B,GAAE,gBAAgB,CAAC,CAAC,CAAM,GAC1B,SAAS,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"span-waterfall.d.ts","sourceRoot":"","sources":["../../src/shared/span-waterfall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAwBH;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa;IACvE,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oEAAoE;IACpE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;IAC5B,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uDAAuD;IACvD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,sDAAsD;IACtD,QAAQ,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,aAAa;IACnD,kEAAkE;IAClE,IAAI,EAAE,CAAC,CAAC;IACR,8EAA8E;IAC9E,MAAM,EAAE,CAAC,EAAE,CAAC;IACZ,4DAA4D;IAC5D,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,aAAa;IAChD,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACxB,0CAA0C;IAC1C,WAAW,EAAE,MAAM,CAAC;CACrB;AAgBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAuB3E;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,aAAa,EACpD,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,EACE,MAAc,EACd,IAAI,EACJ,SAAiB,EACjB,IAAY,EACZ,QAA4B,GAC7B,GAAE,gBAAgB,CAAC,CAAC,CAAM,GAC1B,SAAS,CAAC,CAAC,CAAC,CAkGd"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@timber-js/app",
|
|
3
|
-
"version": "0.2.0-alpha.
|
|
3
|
+
"version": "0.2.0-alpha.239",
|
|
4
4
|
"description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cloudflare-workers",
|
|
@@ -261,7 +261,10 @@ export class DevSpanProcessor implements SpanProcessor {
|
|
|
261
261
|
if (this.mode === 'summary') return formatSpanSummary(spans, this.config);
|
|
262
262
|
// Both 'tree' and 'verbose' use the tree formatter; tree hides
|
|
263
263
|
// explained waits and folds pass-through awaits, verbose prints every span.
|
|
264
|
-
|
|
264
|
+
// Lines are cut to a terminal's width so nothing wraps through the tree;
|
|
265
|
+
// a file or a pipe gets them whole.
|
|
266
|
+
const columns = process.stderr.isTTY ? process.stderr.columns : undefined;
|
|
267
|
+
return formatSpanTree(spans, { ...this.config, columns });
|
|
265
268
|
}
|
|
266
269
|
|
|
267
270
|
async shutdown(): Promise<void> {
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Column layout for the dev request tree: a start and a duration column
|
|
3
|
+
* before the tree, and every line cut to the terminal's width.
|
|
4
|
+
*
|
|
5
|
+
* Lines carry ANSI styling (`util.styleText`), so widths count only what
|
|
6
|
+
* the terminal draws: escape sequences take no columns.
|
|
7
|
+
*
|
|
8
|
+
* See design/21-dev-server.md §"Structured Request Tree" (TIM-1631).
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
/** SGR sequences (`\x1b[33m`) and OSC 8 hyperlinks (`\x1b]8;;url\x07`). */
|
|
12
|
+
const ESCAPE = /\x1b\[[0-9;]*m|\x1b\]8;;[^\x07]*\x07/y;
|
|
13
|
+
const RESET = '\x1b[0m';
|
|
14
|
+
|
|
15
|
+
/** Marks drawn on the character before them, and invisible format characters (ZWJ). */
|
|
16
|
+
const ZERO_WIDTH = /^[\p{Mn}\p{Me}\p{Cf}]$/u;
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Cells a code point takes in a terminal: 0 for combining marks, variation
|
|
20
|
+
* selectors and format characters; 2 for East Asian wide and fullwidth
|
|
21
|
+
* characters (Hangul, CJK, kana, fullwidth forms) and emoji; 1 otherwise.
|
|
22
|
+
* The ranges are the wide blocks of Unicode's East Asian Width (UAX #11)
|
|
23
|
+
* that a URL or a source label can plausibly hold. Codex review on #1295:
|
|
24
|
+
* counting code points let a line with emoji or CJK text still wrap.
|
|
25
|
+
*/
|
|
26
|
+
function cellWidth(codePoint: number, char: string): number {
|
|
27
|
+
if (ZERO_WIDTH.test(char)) return 0;
|
|
28
|
+
const wide =
|
|
29
|
+
(codePoint >= 0x1100 && codePoint <= 0x115f) || // Hangul Jamo
|
|
30
|
+
(codePoint >= 0x2e80 && codePoint <= 0xa4cf && codePoint !== 0x303f) || // CJK … Yi
|
|
31
|
+
(codePoint >= 0xac00 && codePoint <= 0xd7a3) || // Hangul syllables
|
|
32
|
+
(codePoint >= 0xf900 && codePoint <= 0xfaff) || // CJK compatibility ideographs
|
|
33
|
+
(codePoint >= 0xfe30 && codePoint <= 0xfe4f) || // CJK compatibility forms
|
|
34
|
+
(codePoint >= 0xff00 && codePoint <= 0xff60) || // fullwidth forms
|
|
35
|
+
(codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
|
|
36
|
+
(codePoint >= 0x1f300 && codePoint <= 0x1faff) || // emoji and pictographs
|
|
37
|
+
(codePoint >= 0x20000 && codePoint <= 0x3fffd); // CJK extensions
|
|
38
|
+
return wide ? 2 : 1;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Cells `text` takes in a terminal, escape sequences excluded. */
|
|
42
|
+
export function visibleWidth(text: string): number {
|
|
43
|
+
let width = 0;
|
|
44
|
+
for (let i = 0; i < text.length;) {
|
|
45
|
+
ESCAPE.lastIndex = i;
|
|
46
|
+
const escape = ESCAPE.exec(text);
|
|
47
|
+
if (escape) {
|
|
48
|
+
i += escape[0].length;
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const codePoint = text.codePointAt(i) ?? 0;
|
|
52
|
+
const char = String.fromCodePoint(codePoint);
|
|
53
|
+
i += char.length;
|
|
54
|
+
width += cellWidth(codePoint, char);
|
|
55
|
+
}
|
|
56
|
+
return width;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* `line` cut to `columns` with a trailing `…`, so a long URL or label never
|
|
61
|
+
* wraps through the tree's rails. Escape sequences are kept, and a style left
|
|
62
|
+
* open by the cut is reset. `columns` undefined (output is not a terminal:
|
|
63
|
+
* a file, a pipe, an agent reading the log) leaves the line whole.
|
|
64
|
+
*/
|
|
65
|
+
export function fitToWidth(line: string, columns: number | undefined): string {
|
|
66
|
+
if (columns === undefined || columns < 2 || visibleWidth(line) <= columns) return line;
|
|
67
|
+
let out = '';
|
|
68
|
+
let width = 0;
|
|
69
|
+
let styled = false;
|
|
70
|
+
for (let i = 0; i < line.length;) {
|
|
71
|
+
ESCAPE.lastIndex = i;
|
|
72
|
+
const escape = ESCAPE.exec(line);
|
|
73
|
+
if (escape) {
|
|
74
|
+
out += escape[0];
|
|
75
|
+
styled = escape[0] !== RESET;
|
|
76
|
+
i += escape[0].length;
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
const codePoint = line.codePointAt(i) ?? 0;
|
|
80
|
+
const char = String.fromCodePoint(codePoint);
|
|
81
|
+
const cells = cellWidth(codePoint, char);
|
|
82
|
+
// Leave a cell for the `…`; a wide character that would cross it stays out.
|
|
83
|
+
if (width + cells > columns - 1) break;
|
|
84
|
+
out += char;
|
|
85
|
+
i += char.length;
|
|
86
|
+
width += cells;
|
|
87
|
+
}
|
|
88
|
+
return `${out}…${styled ? RESET : ''}`;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* The fewest columns the cut part of a line keeps before {@link fitParts}
|
|
93
|
+
* gives up on keeping the tail whole: a URL cut to nothing says nothing.
|
|
94
|
+
*/
|
|
95
|
+
const MIN_HEAD = 12;
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* `head` then `tail`, fitted to `columns` by cutting the head: the tail
|
|
99
|
+
* (a fetch's status and cache, an access outcome, the trace ID) is what the
|
|
100
|
+
* end of a line says, and a cut that drops it loses the point of the line.
|
|
101
|
+
* When the tail leaves the head less than {@link MIN_HEAD} columns, the
|
|
102
|
+
* whole line is cut instead.
|
|
103
|
+
*/
|
|
104
|
+
export function fitParts(head: string, tail: string, columns: number | undefined): string {
|
|
105
|
+
const line = head + tail;
|
|
106
|
+
if (columns === undefined || visibleWidth(line) <= columns) return line;
|
|
107
|
+
const budget = columns - visibleWidth(tail);
|
|
108
|
+
return budget >= MIN_HEAD ? fitToWidth(head, budget) + tail : fitToWidth(line, columns);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** A tree line, with the times shown in the columns before it. */
|
|
112
|
+
export interface ColumnLine {
|
|
113
|
+
/** Start, relative to the request, in ms. Absent on annotation lines. */
|
|
114
|
+
startMs?: number;
|
|
115
|
+
/** Duration in ms. Absent on annotation lines. */
|
|
116
|
+
durationMs?: number;
|
|
117
|
+
/** Past the slow threshold: the duration is highlighted. */
|
|
118
|
+
slow?: boolean;
|
|
119
|
+
text: string;
|
|
120
|
+
/** Kept whole when the line is cut to the terminal's width; see {@link fitParts}. */
|
|
121
|
+
tail?: string;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export interface ColumnStyles {
|
|
125
|
+
dim: (text: string) => string;
|
|
126
|
+
slow: (text: string) => string;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Lay out `rows` as `start dur text`, both columns right-aligned to the
|
|
131
|
+
* widest value (and their headers), then cut each line to `columns`,
|
|
132
|
+
* keeping its tail. The start is dimmed; the duration is the column to scan,
|
|
133
|
+
* so it is not.
|
|
134
|
+
*/
|
|
135
|
+
export function renderColumns(
|
|
136
|
+
rows: readonly ColumnLine[],
|
|
137
|
+
columns: number | undefined,
|
|
138
|
+
styles: ColumnStyles
|
|
139
|
+
): string[] {
|
|
140
|
+
const ms = (value: number | undefined) => (value === undefined ? '' : `${value}ms`);
|
|
141
|
+
const startWidth = Math.max('start'.length, ...rows.map((r) => ms(r.startMs).length));
|
|
142
|
+
const durWidth = Math.max('dur'.length, ...rows.map((r) => ms(r.durationMs).length));
|
|
143
|
+
const header = `${'start'.padStart(startWidth)} ${'dur'.padStart(durWidth)}`;
|
|
144
|
+
return [
|
|
145
|
+
fitToWidth(styles.dim(header), columns),
|
|
146
|
+
...rows.map((r) => {
|
|
147
|
+
const start = styles.dim(ms(r.startMs).padStart(startWidth));
|
|
148
|
+
const dur = ms(r.durationMs).padStart(durWidth);
|
|
149
|
+
return fitParts(
|
|
150
|
+
`${start} ${r.slow ? styles.slow(dur) : dur} ${r.text}`,
|
|
151
|
+
r.tail ?? '',
|
|
152
|
+
columns
|
|
153
|
+
);
|
|
154
|
+
}),
|
|
155
|
+
];
|
|
156
|
+
}
|