@dbx-tools/appkit-mastra 0.9.40 → 0.9.43
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/README.md +7 -3
- package/index.ts +4 -3
- package/lib/index.d.ts +4 -3
- package/lib/index.js +4 -4
- package/lib/src/observability.d.ts +1 -1
- package/lib/src/observability.js +2 -2
- package/lib/src/plugin.js +5 -3
- package/lib/src/{trace-io.d.ts → telemetry.d.ts} +17 -3
- package/lib/src/telemetry.js +326 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +19 -19
- package/src/observability.ts +1 -1
- package/src/plugin.ts +5 -2
- package/src/{trace-io.ts → telemetry.ts} +113 -11
- package/lib/src/trace-io.js +0 -235
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copy each Mastra chat turn's request/response onto its OTel root span
|
|
3
|
+
* so Databricks-managed MLflow can display them.
|
|
4
|
+
*
|
|
5
|
+
* Why this exists: MLflow's UC `<target>_trace_unified` view picks the
|
|
6
|
+
* one span whose `parent_span_id` is empty and reads request/response
|
|
7
|
+
* from `mlflow.spanInputs` / `mlflow.spanOutputs` (or the `gen_ai.*`
|
|
8
|
+
* equivalents) on THAT span only. Mastra records the turn on its
|
|
9
|
+
* `invoke_agent` child under `mastra.agent_run.input` / `.output`, keys
|
|
10
|
+
* the view never reads, so chat traces arrive with both columns null
|
|
11
|
+
* even when the spans themselves look healthy.
|
|
12
|
+
*
|
|
13
|
+
* AppKit's HTTP instrumentation records the server span in OTel RPC metadata,
|
|
14
|
+
* which remains available even when Express makes a middleware-layer child
|
|
15
|
+
* active. When instrumentation is unavailable, this module creates one
|
|
16
|
+
* request-lifetime server span and runs Mastra under it.
|
|
17
|
+
*
|
|
18
|
+
* @module
|
|
19
|
+
*/
|
|
20
|
+
import { StringDecoder } from "node:string_decoder";
|
|
21
|
+
import { json, log, object } from "@dbx-tools/shared-core";
|
|
22
|
+
import { context, SpanKind, trace } from "@opentelemetry/api";
|
|
23
|
+
import { getRPCMetadata, RPCType } from "@opentelemetry/core";
|
|
24
|
+
const logger = log.logger("mastra/telemetry");
|
|
25
|
+
/** Cap on each payload copied onto a span, so one turn cannot bloat the export. */
|
|
26
|
+
export const TRACE_IO_LIMIT = 8_000;
|
|
27
|
+
/** Bound for a non-streaming body captured through `res.end` instead of `res.json`. */
|
|
28
|
+
const RESPONSE_BODY_LIMIT = TRACE_IO_LIMIT * 4;
|
|
29
|
+
/** Tracer scope used only when AppKit did not create a recording HTTP span. */
|
|
30
|
+
const CHAT_TURN_TRACER = "@dbx-tools/appkit-mastra/telemetry";
|
|
31
|
+
/**
|
|
32
|
+
* Mount-relative Mastra agent invoke paths that carry a chat turn body
|
|
33
|
+
* (`messages`) and stream an assistant answer. Resume / approve verbs
|
|
34
|
+
* are intentionally excluded: their bodies are tool decisions, not the
|
|
35
|
+
* user prompt, and they rarely produce a fresh answer worth surfacing.
|
|
36
|
+
*/
|
|
37
|
+
const AGENT_TURN_ROUTE = /^(?:\/agents\/[^/]+\/(?:stream|generate)(?:\/|$)|\/chat\/[^/]+$)/i;
|
|
38
|
+
/** Attribute keys the MLflow UC `*_trace_unified` view reads from the root span. */
|
|
39
|
+
export const MLFLOW_SPAN_INPUTS_ATTR = "mlflow.spanInputs";
|
|
40
|
+
/** Root-span attribute consumed as chat output by MLflow unified trace views. */
|
|
41
|
+
export const MLFLOW_SPAN_OUTPUTS_ATTR = "mlflow.spanOutputs";
|
|
42
|
+
/** Full serialized request messages retained when the MLflow preview is plain text. */
|
|
43
|
+
export const CHAT_MESSAGES_ATTR = "appkit.mastra.chat.messages";
|
|
44
|
+
/** Full serialized response retained when the MLflow preview is plain text. */
|
|
45
|
+
export const CHAT_RESPONSE_ATTR = "appkit.mastra.chat.response";
|
|
46
|
+
/** Credential mode used by Databricks calls in this chat turn. */
|
|
47
|
+
export const CHAT_IDENTITY_ATTR = "appkit.mastra.identity.mode";
|
|
48
|
+
/** Whether the streamed turn emitted a Genie tool or progress event. */
|
|
49
|
+
export const CHAT_GENIE_USED_ATTR = "appkit.mastra.genie.used";
|
|
50
|
+
/** Return one raw prompt when the request is exactly one text-only user message. */
|
|
51
|
+
export function textOnlyChatInput(messages) {
|
|
52
|
+
if (typeof messages === "string")
|
|
53
|
+
return messages || undefined;
|
|
54
|
+
if (!Array.isArray(messages) || messages.length !== 1)
|
|
55
|
+
return undefined;
|
|
56
|
+
const message = messages[0];
|
|
57
|
+
if (!object.isRecord(message) || message.role !== "user")
|
|
58
|
+
return undefined;
|
|
59
|
+
if (typeof message.content === "string")
|
|
60
|
+
return message.content || undefined;
|
|
61
|
+
return textFromParts(message.parts) ?? textFromParts(message.content);
|
|
62
|
+
}
|
|
63
|
+
function textFromParts(value) {
|
|
64
|
+
if (!Array.isArray(value) || value.length === 0)
|
|
65
|
+
return undefined;
|
|
66
|
+
const text = [];
|
|
67
|
+
for (const part of value) {
|
|
68
|
+
if (!object.isRecord(part) || part.type !== "text" || typeof part.text !== "string") {
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
text.push(part.text);
|
|
72
|
+
}
|
|
73
|
+
const joined = text.join("");
|
|
74
|
+
return joined || undefined;
|
|
75
|
+
}
|
|
76
|
+
function serialized(value, limit = TRACE_IO_LIMIT) {
|
|
77
|
+
return JSON.stringify(value)?.slice(0, limit) ?? String(value).slice(0, limit);
|
|
78
|
+
}
|
|
79
|
+
function sseFrame(line) {
|
|
80
|
+
if (!line.startsWith("data:"))
|
|
81
|
+
return undefined;
|
|
82
|
+
return json.parse(line.slice(5));
|
|
83
|
+
}
|
|
84
|
+
function valueUsesGenie(value, depth = 0) {
|
|
85
|
+
if (depth > 3)
|
|
86
|
+
return false;
|
|
87
|
+
if (Array.isArray(value))
|
|
88
|
+
return value.some((item) => valueUsesGenie(item, depth + 1));
|
|
89
|
+
if (!object.isRecord(value))
|
|
90
|
+
return false;
|
|
91
|
+
if (value.type === "data-genie-progress" ||
|
|
92
|
+
value.type === "ask_genie_done" ||
|
|
93
|
+
value.toolName === "ask_genie" ||
|
|
94
|
+
value.tool_name === "ask_genie" ||
|
|
95
|
+
value.name === "ask_genie") {
|
|
96
|
+
return true;
|
|
97
|
+
}
|
|
98
|
+
return ["data", "event", "payload"].some((key) => valueUsesGenie(value[key], depth + 1));
|
|
99
|
+
}
|
|
100
|
+
/** Return the assistant text from one SSE line, or an empty string. */
|
|
101
|
+
function assistantTextFromSseLine(line) {
|
|
102
|
+
return assistantTextFromSseFrame(sseFrame(line));
|
|
103
|
+
}
|
|
104
|
+
function assistantTextFromSseFrame(frame) {
|
|
105
|
+
if (!object.isRecord(frame) || frame.type !== "text-delta")
|
|
106
|
+
return "";
|
|
107
|
+
const text = typeof frame.delta === "string"
|
|
108
|
+
? frame.delta
|
|
109
|
+
: object.isRecord(frame.payload)
|
|
110
|
+
? frame.payload.text
|
|
111
|
+
: undefined;
|
|
112
|
+
return typeof text === "string" ? text : "";
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Concatenate the assistant's answer out of an AI SDK SSE transcript.
|
|
116
|
+
*
|
|
117
|
+
* The agent streams its reply as `text-delta` frames
|
|
118
|
+
* (`data: {"type":"text-delta","payload":{"text":"..."}}`), so the full
|
|
119
|
+
* answer only ever exists as deltas on the wire and has to be
|
|
120
|
+
* reassembled here.
|
|
121
|
+
*/
|
|
122
|
+
export function assistantTextFromSse(body) {
|
|
123
|
+
const parts = [];
|
|
124
|
+
for (const line of body.split("\n")) {
|
|
125
|
+
const text = assistantTextFromSseLine(line);
|
|
126
|
+
if (text)
|
|
127
|
+
parts.push(text);
|
|
128
|
+
}
|
|
129
|
+
return parts.join("").slice(0, TRACE_IO_LIMIT);
|
|
130
|
+
}
|
|
131
|
+
/** Read the final assistant text from a non-streaming Mastra response. */
|
|
132
|
+
export function assistantTextFromJson(body) {
|
|
133
|
+
if (!object.isRecord(body) || typeof body.text !== "string")
|
|
134
|
+
return "";
|
|
135
|
+
return body.text.slice(0, TRACE_IO_LIMIT);
|
|
136
|
+
}
|
|
137
|
+
/** Incrementally assemble UTF-8 SSE text while retaining a bounded JSON fallback. */
|
|
138
|
+
class AssistantResponseCollector {
|
|
139
|
+
decoder = new StringDecoder("utf8");
|
|
140
|
+
answer = "";
|
|
141
|
+
body = "";
|
|
142
|
+
pendingLine = "";
|
|
143
|
+
finished = false;
|
|
144
|
+
genie = false;
|
|
145
|
+
write(chunk) {
|
|
146
|
+
if (this.finished)
|
|
147
|
+
return;
|
|
148
|
+
if (typeof chunk === "string") {
|
|
149
|
+
this.consume(chunk);
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
if (ArrayBuffer.isView(chunk)) {
|
|
153
|
+
this.consume(this.decoder.write(Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength)));
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
finish() {
|
|
157
|
+
if (this.finished)
|
|
158
|
+
return this.answer || this.jsonAnswer();
|
|
159
|
+
this.finished = true;
|
|
160
|
+
this.consume(this.decoder.end());
|
|
161
|
+
this.consumeSseLine(this.pendingLine);
|
|
162
|
+
this.pendingLine = "";
|
|
163
|
+
return this.answer || this.jsonAnswer();
|
|
164
|
+
}
|
|
165
|
+
rawBody() {
|
|
166
|
+
return this.body.slice(0, TRACE_IO_LIMIT);
|
|
167
|
+
}
|
|
168
|
+
usedGenie() {
|
|
169
|
+
return this.genie;
|
|
170
|
+
}
|
|
171
|
+
consume(text) {
|
|
172
|
+
if (!text)
|
|
173
|
+
return;
|
|
174
|
+
if (this.body.length < RESPONSE_BODY_LIMIT) {
|
|
175
|
+
this.body += text.slice(0, RESPONSE_BODY_LIMIT - this.body.length);
|
|
176
|
+
}
|
|
177
|
+
this.pendingLine += text;
|
|
178
|
+
let newline = this.pendingLine.indexOf("\n");
|
|
179
|
+
while (newline >= 0) {
|
|
180
|
+
this.consumeSseLine(this.pendingLine.slice(0, newline).replace(/\r$/, ""));
|
|
181
|
+
this.pendingLine = this.pendingLine.slice(newline + 1);
|
|
182
|
+
newline = this.pendingLine.indexOf("\n");
|
|
183
|
+
}
|
|
184
|
+
if (this.pendingLine.length > RESPONSE_BODY_LIMIT) {
|
|
185
|
+
this.pendingLine = this.pendingLine.slice(-RESPONSE_BODY_LIMIT);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
consumeSseLine(line) {
|
|
189
|
+
const frame = sseFrame(line);
|
|
190
|
+
this.genie ||= valueUsesGenie(frame);
|
|
191
|
+
if (this.answer.length >= TRACE_IO_LIMIT)
|
|
192
|
+
return;
|
|
193
|
+
const text = assistantTextFromSseFrame(frame);
|
|
194
|
+
this.answer += text.slice(0, TRACE_IO_LIMIT - this.answer.length);
|
|
195
|
+
}
|
|
196
|
+
jsonAnswer() {
|
|
197
|
+
return assistantTextFromJson(json.parse(this.body));
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Select the span MLflow treats as the request root.
|
|
202
|
+
*
|
|
203
|
+
* OTel HTTP instrumentation stores its server span in RPC metadata. That span
|
|
204
|
+
* wins over an active Express child. If no recording local span exists, create
|
|
205
|
+
* one under the current context so enabled W3C propagation remains intact.
|
|
206
|
+
*/
|
|
207
|
+
function resolveTraceTarget() {
|
|
208
|
+
const activeContext = context.active();
|
|
209
|
+
const rpc = getRPCMetadata(activeContext);
|
|
210
|
+
if (rpc?.type === RPCType.HTTP && rpc.span.isRecording()) {
|
|
211
|
+
return { span: rpc.span, owned: false };
|
|
212
|
+
}
|
|
213
|
+
const active = trace.getActiveSpan();
|
|
214
|
+
if (active?.isRecording())
|
|
215
|
+
return { span: active, owned: false };
|
|
216
|
+
const span = trace
|
|
217
|
+
.getTracer(CHAT_TURN_TRACER)
|
|
218
|
+
.startSpan("mastra.chat_turn", { kind: SpanKind.SERVER }, activeContext);
|
|
219
|
+
if (!span.isRecording()) {
|
|
220
|
+
span.end();
|
|
221
|
+
return undefined;
|
|
222
|
+
}
|
|
223
|
+
return { span, owned: true };
|
|
224
|
+
}
|
|
225
|
+
/**
|
|
226
|
+
* Express middleware that stamps chat turn I/O onto the exported OTel root.
|
|
227
|
+
*
|
|
228
|
+
* Tee `res.write`, `res.json`, and `res.end` instead of listening for `finish`:
|
|
229
|
+
* HTTP instrumentation ends its server span on finish, and attributes set
|
|
230
|
+
* after a span ends never reach the exporter.
|
|
231
|
+
*
|
|
232
|
+
* `path` is mount-relative (what the Mastra sub-app sees), e.g.
|
|
233
|
+
* `/agents/support/stream`.
|
|
234
|
+
*/
|
|
235
|
+
export function chatTurnTelemetryMiddleware(req, res, next, options = {}) {
|
|
236
|
+
if (req.method !== "POST" || !AGENT_TURN_ROUTE.test(req.path)) {
|
|
237
|
+
next();
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
const target = resolveTraceTarget();
|
|
241
|
+
if (!target) {
|
|
242
|
+
next();
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
const identity = typeof options.identity === "function" ? options.identity(req) : options.identity;
|
|
246
|
+
if (identity) {
|
|
247
|
+
target.span.setAttribute(CHAT_IDENTITY_ATTR, identity);
|
|
248
|
+
}
|
|
249
|
+
target.span.setAttribute(CHAT_GENIE_USED_ATTR, false);
|
|
250
|
+
const messages = req.body?.messages;
|
|
251
|
+
if (messages !== undefined) {
|
|
252
|
+
const fullInput = serialized(messages);
|
|
253
|
+
target.span.setAttribute(CHAT_MESSAGES_ATTR, fullInput);
|
|
254
|
+
target.span.setAttribute(MLFLOW_SPAN_INPUTS_ATTR, (textOnlyChatInput(messages) ?? fullInput).slice(0, TRACE_IO_LIMIT));
|
|
255
|
+
}
|
|
256
|
+
const collector = new AssistantResponseCollector();
|
|
257
|
+
let outputRecorded = false;
|
|
258
|
+
let fullOutputRecorded = false;
|
|
259
|
+
let ownedSpanEnded = false;
|
|
260
|
+
const passThroughWrite = res.write.bind(res);
|
|
261
|
+
const passThroughEnd = res.end.bind(res);
|
|
262
|
+
const passThroughJson = res.json.bind(res);
|
|
263
|
+
const recordOutput = (answer) => {
|
|
264
|
+
if (outputRecorded || !answer)
|
|
265
|
+
return;
|
|
266
|
+
target.span.setAttribute(MLFLOW_SPAN_OUTPUTS_ATTR, answer.slice(0, TRACE_IO_LIMIT));
|
|
267
|
+
outputRecorded = true;
|
|
268
|
+
};
|
|
269
|
+
const recordFullOutput = (response) => {
|
|
270
|
+
if (fullOutputRecorded || !response)
|
|
271
|
+
return;
|
|
272
|
+
target.span.setAttribute(CHAT_RESPONSE_ATTR, response.slice(0, TRACE_IO_LIMIT));
|
|
273
|
+
fullOutputRecorded = true;
|
|
274
|
+
};
|
|
275
|
+
const recordGenie = (used) => {
|
|
276
|
+
if (used)
|
|
277
|
+
target.span.setAttribute(CHAT_GENIE_USED_ATTR, true);
|
|
278
|
+
};
|
|
279
|
+
const endOwnedSpan = () => {
|
|
280
|
+
if (!target.owned || ownedSpanEnded)
|
|
281
|
+
return;
|
|
282
|
+
ownedSpanEnded = true;
|
|
283
|
+
target.span.end();
|
|
284
|
+
};
|
|
285
|
+
res.write = ((chunk, ...rest) => {
|
|
286
|
+
collector.write(chunk);
|
|
287
|
+
return passThroughWrite(chunk, ...rest);
|
|
288
|
+
});
|
|
289
|
+
res.json = ((body) => {
|
|
290
|
+
recordFullOutput(serialized(body));
|
|
291
|
+
recordGenie(valueUsesGenie(body));
|
|
292
|
+
recordOutput(assistantTextFromJson(body));
|
|
293
|
+
return passThroughJson(body);
|
|
294
|
+
});
|
|
295
|
+
res.end = ((chunk, ...rest) => {
|
|
296
|
+
collector.write(chunk);
|
|
297
|
+
recordOutput(collector.finish());
|
|
298
|
+
recordFullOutput(collector.rawBody());
|
|
299
|
+
recordGenie(collector.usedGenie());
|
|
300
|
+
try {
|
|
301
|
+
return passThroughEnd(chunk, ...rest);
|
|
302
|
+
}
|
|
303
|
+
finally {
|
|
304
|
+
endOwnedSpan();
|
|
305
|
+
}
|
|
306
|
+
});
|
|
307
|
+
res.once("close", () => {
|
|
308
|
+
recordOutput(collector.finish());
|
|
309
|
+
recordFullOutput(collector.rawBody());
|
|
310
|
+
recordGenie(collector.usedGenie());
|
|
311
|
+
endOwnedSpan();
|
|
312
|
+
});
|
|
313
|
+
context.with(trace.setSpan(context.active(), target.span), next);
|
|
314
|
+
}
|
|
315
|
+
/**
|
|
316
|
+
* Install {@link chatTurnTelemetryMiddleware} on a Mastra Express sub-app.
|
|
317
|
+
*
|
|
318
|
+
* Call before `MastraServer.init()` so the layer sits ahead of the agent
|
|
319
|
+
* routes. Safe to call unconditionally: when no recording tracer is registered,
|
|
320
|
+
* the middleware is a no-op.
|
|
321
|
+
*/
|
|
322
|
+
export function attachChatTurnTelemetry(app, options = {}) {
|
|
323
|
+
app.use((req, res, next) => chatTurnTelemetryMiddleware(req, res, next, options));
|
|
324
|
+
logger.info("chat turn telemetry middleware attached", options);
|
|
325
|
+
}
|
|
326
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copy each Mastra chat turn's request/response onto its OTel root span\n * so Databricks-managed MLflow can display them.\n *\n * Why this exists: MLflow's UC `<target>_trace_unified` view picks the\n * one span whose `parent_span_id` is empty and reads request/response\n * from `mlflow.spanInputs` / `mlflow.spanOutputs` (or the `gen_ai.*`\n * equivalents) on THAT span only. Mastra records the turn on its\n * `invoke_agent` child under `mastra.agent_run.input` / `.output`, keys\n * the view never reads, so chat traces arrive with both columns null\n * even when the spans themselves look healthy.\n *\n * AppKit's HTTP instrumentation records the server span in OTel RPC metadata,\n * which remains available even when Express makes a middleware-layer child\n * active. When instrumentation is unavailable, this module creates one\n * request-lifetime server span and runs Mastra under it.\n *\n * @module\n */\n\nimport { StringDecoder } from \"node:string_decoder\";\n\nimport { json, log, object } from \"@dbx-tools/shared-core\";\nimport { context, SpanKind, trace, type Span } from \"@opentelemetry/api\";\nimport { getRPCMetadata, RPCType } from \"@opentelemetry/core\";\nimport type express from \"express\";\n\nconst logger = log.logger(\"mastra/telemetry\");\n\n/** Cap on each payload copied onto a span, so one turn cannot bloat the export. */\nexport const TRACE_IO_LIMIT = 8_000;\n\n/** Bound for a non-streaming body captured through `res.end` instead of `res.json`. */\nconst RESPONSE_BODY_LIMIT = TRACE_IO_LIMIT * 4;\n\n/** Tracer scope used only when AppKit did not create a recording HTTP span. */\nconst CHAT_TURN_TRACER = \"@dbx-tools/appkit-mastra/telemetry\";\n\n/**\n * Mount-relative Mastra agent invoke paths that carry a chat turn body\n * (`messages`) and stream an assistant answer. Resume / approve verbs\n * are intentionally excluded: their bodies are tool decisions, not the\n * user prompt, and they rarely produce a fresh answer worth surfacing.\n */\nconst AGENT_TURN_ROUTE = /^(?:\\/agents\\/[^/]+\\/(?:stream|generate)(?:\\/|$)|\\/chat\\/[^/]+$)/i;\n\n/** Attribute keys the MLflow UC `*_trace_unified` view reads from the root span. */\nexport const MLFLOW_SPAN_INPUTS_ATTR = \"mlflow.spanInputs\";\n/** Root-span attribute consumed as chat output by MLflow unified trace views. */\nexport const MLFLOW_SPAN_OUTPUTS_ATTR = \"mlflow.spanOutputs\";\n/** Full serialized request messages retained when the MLflow preview is plain text. */\nexport const CHAT_MESSAGES_ATTR = \"appkit.mastra.chat.messages\";\n/** Full serialized response retained when the MLflow preview is plain text. */\nexport const CHAT_RESPONSE_ATTR = \"appkit.mastra.chat.response\";\n/** Credential mode used by Databricks calls in this chat turn. */\nexport const CHAT_IDENTITY_ATTR = \"appkit.mastra.identity.mode\";\n/** Whether the streamed turn emitted a Genie tool or progress event. */\nexport const CHAT_GENIE_USED_ATTR = \"appkit.mastra.genie.used\";\n\n/** Root-span metadata known before a chat request is dispatched. */\nexport interface ChatTurnTelemetryOptions {\n  readonly identity?:\n    \"obo\" | \"service-principal\" | ((request: express.Request) => \"obo\" | \"service-principal\");\n}\n\ninterface TraceTarget {\n  span: Span;\n  owned: boolean;\n}\n\n/** Return one raw prompt when the request is exactly one text-only user message. */\nexport function textOnlyChatInput(messages: unknown): string | undefined {\n  if (typeof messages === \"string\") return messages || undefined;\n  if (!Array.isArray(messages) || messages.length !== 1) return undefined;\n  const message = messages[0];\n  if (!object.isRecord(message) || message.role !== \"user\") return undefined;\n  if (typeof message.content === \"string\") return message.content || undefined;\n  return textFromParts(message.parts) ?? textFromParts(message.content);\n}\n\nfunction textFromParts(value: unknown): string | undefined {\n  if (!Array.isArray(value) || value.length === 0) return undefined;\n  const text: string[] = [];\n  for (const part of value) {\n    if (!object.isRecord(part) || part.type !== \"text\" || typeof part.text !== \"string\") {\n      return undefined;\n    }\n    text.push(part.text);\n  }\n  const joined = text.join(\"\");\n  return joined || undefined;\n}\n\nfunction serialized(value: unknown, limit = TRACE_IO_LIMIT): string {\n  return JSON.stringify(value)?.slice(0, limit) ?? String(value).slice(0, limit);\n}\n\nfunction sseFrame(line: string): unknown {\n  if (!line.startsWith(\"data:\")) return undefined;\n  return json.parse(line.slice(5));\n}\n\nfunction valueUsesGenie(value: unknown, depth = 0): boolean {\n  if (depth > 3) return false;\n  if (Array.isArray(value)) return value.some((item) => valueUsesGenie(item, depth + 1));\n  if (!object.isRecord(value)) return false;\n  if (\n    value.type === \"data-genie-progress\" ||\n    value.type === \"ask_genie_done\" ||\n    value.toolName === \"ask_genie\" ||\n    value.tool_name === \"ask_genie\" ||\n    value.name === \"ask_genie\"\n  ) {\n    return true;\n  }\n  return [\"data\", \"event\", \"payload\"].some((key) => valueUsesGenie(value[key], depth + 1));\n}\n\n/** Return the assistant text from one SSE line, or an empty string. */\nfunction assistantTextFromSseLine(line: string): string {\n  return assistantTextFromSseFrame(sseFrame(line));\n}\n\nfunction assistantTextFromSseFrame(frame: unknown): string {\n  if (!object.isRecord(frame) || frame.type !== \"text-delta\") return \"\";\n  const text =\n    typeof frame.delta === \"string\"\n      ? frame.delta\n      : object.isRecord(frame.payload)\n        ? frame.payload.text\n        : undefined;\n  return typeof text === \"string\" ? text : \"\";\n}\n\n/**\n * Concatenate the assistant's answer out of an AI SDK SSE transcript.\n *\n * The agent streams its reply as `text-delta` frames\n * (`data: {\"type\":\"text-delta\",\"payload\":{\"text\":\"...\"}}`), so the full\n * answer only ever exists as deltas on the wire and has to be\n * reassembled here.\n */\nexport function assistantTextFromSse(body: string): string {\n  const parts: string[] = [];\n  for (const line of body.split(\"\\n\")) {\n    const text = assistantTextFromSseLine(line);\n    if (text) parts.push(text);\n  }\n  return parts.join(\"\").slice(0, TRACE_IO_LIMIT);\n}\n\n/** Read the final assistant text from a non-streaming Mastra response. */\nexport function assistantTextFromJson(body: unknown): string {\n  if (!object.isRecord(body) || typeof body.text !== \"string\") return \"\";\n  return body.text.slice(0, TRACE_IO_LIMIT);\n}\n\n/** Incrementally assemble UTF-8 SSE text while retaining a bounded JSON fallback. */\nclass AssistantResponseCollector {\n  private readonly decoder = new StringDecoder(\"utf8\");\n  private answer = \"\";\n  private body = \"\";\n  private pendingLine = \"\";\n  private finished = false;\n  private genie = false;\n\n  write(chunk: unknown): void {\n    if (this.finished) return;\n    if (typeof chunk === \"string\") {\n      this.consume(chunk);\n      return;\n    }\n    if (ArrayBuffer.isView(chunk)) {\n      this.consume(\n        this.decoder.write(Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength)),\n      );\n    }\n  }\n\n  finish(): string {\n    if (this.finished) return this.answer || this.jsonAnswer();\n    this.finished = true;\n    this.consume(this.decoder.end());\n    this.consumeSseLine(this.pendingLine);\n    this.pendingLine = \"\";\n    return this.answer || this.jsonAnswer();\n  }\n\n  rawBody(): string {\n    return this.body.slice(0, TRACE_IO_LIMIT);\n  }\n\n  usedGenie(): boolean {\n    return this.genie;\n  }\n\n  private consume(text: string): void {\n    if (!text) return;\n    if (this.body.length < RESPONSE_BODY_LIMIT) {\n      this.body += text.slice(0, RESPONSE_BODY_LIMIT - this.body.length);\n    }\n    this.pendingLine += text;\n    let newline = this.pendingLine.indexOf(\"\\n\");\n    while (newline >= 0) {\n      this.consumeSseLine(this.pendingLine.slice(0, newline).replace(/\\r$/, \"\"));\n      this.pendingLine = this.pendingLine.slice(newline + 1);\n      newline = this.pendingLine.indexOf(\"\\n\");\n    }\n    if (this.pendingLine.length > RESPONSE_BODY_LIMIT) {\n      this.pendingLine = this.pendingLine.slice(-RESPONSE_BODY_LIMIT);\n    }\n  }\n\n  private consumeSseLine(line: string): void {\n    const frame = sseFrame(line);\n    this.genie ||= valueUsesGenie(frame);\n    if (this.answer.length >= TRACE_IO_LIMIT) return;\n    const text = assistantTextFromSseFrame(frame);\n    this.answer += text.slice(0, TRACE_IO_LIMIT - this.answer.length);\n  }\n\n  private jsonAnswer(): string {\n    return assistantTextFromJson(json.parse(this.body));\n  }\n}\n\n/**\n * Select the span MLflow treats as the request root.\n *\n * OTel HTTP instrumentation stores its server span in RPC metadata. That span\n * wins over an active Express child. If no recording local span exists, create\n * one under the current context so enabled W3C propagation remains intact.\n */\nfunction resolveTraceTarget(): TraceTarget | undefined {\n  const activeContext = context.active();\n  const rpc = getRPCMetadata(activeContext);\n  if (rpc?.type === RPCType.HTTP && rpc.span.isRecording()) {\n    return { span: rpc.span, owned: false };\n  }\n\n  const active = trace.getActiveSpan();\n  if (active?.isRecording()) return { span: active, owned: false };\n\n  const span = trace\n    .getTracer(CHAT_TURN_TRACER)\n    .startSpan(\"mastra.chat_turn\", { kind: SpanKind.SERVER }, activeContext);\n  if (!span.isRecording()) {\n    span.end();\n    return undefined;\n  }\n  return { span, owned: true };\n}\n\n/**\n * Express middleware that stamps chat turn I/O onto the exported OTel root.\n *\n * Tee `res.write`, `res.json`, and `res.end` instead of listening for `finish`:\n * HTTP instrumentation ends its server span on finish, and attributes set\n * after a span ends never reach the exporter.\n *\n * `path` is mount-relative (what the Mastra sub-app sees), e.g.\n * `/agents/support/stream`.\n */\nexport function chatTurnTelemetryMiddleware(\n  req: express.Request,\n  res: express.Response,\n  next: express.NextFunction,\n  options: ChatTurnTelemetryOptions = {},\n): void {\n  if (req.method !== \"POST\" || !AGENT_TURN_ROUTE.test(req.path)) {\n    next();\n    return;\n  }\n  const target = resolveTraceTarget();\n  if (!target) {\n    next();\n    return;\n  }\n  const identity =\n    typeof options.identity === \"function\" ? options.identity(req) : options.identity;\n  if (identity) {\n    target.span.setAttribute(CHAT_IDENTITY_ATTR, identity);\n  }\n  target.span.setAttribute(CHAT_GENIE_USED_ATTR, false);\n\n  const messages = (req.body as { messages?: unknown } | undefined)?.messages;\n  if (messages !== undefined) {\n    const fullInput = serialized(messages);\n    target.span.setAttribute(CHAT_MESSAGES_ATTR, fullInput);\n    target.span.setAttribute(\n      MLFLOW_SPAN_INPUTS_ATTR,\n      (textOnlyChatInput(messages) ?? fullInput).slice(0, TRACE_IO_LIMIT),\n    );\n  }\n\n  const collector = new AssistantResponseCollector();\n  let outputRecorded = false;\n  let fullOutputRecorded = false;\n  let ownedSpanEnded = false;\n  const passThroughWrite = res.write.bind(res) as (...args: unknown[]) => boolean;\n  const passThroughEnd = res.end.bind(res) as (...args: unknown[]) => unknown;\n  const passThroughJson = res.json.bind(res) as (body?: unknown) => express.Response;\n  const recordOutput = (answer: string): void => {\n    if (outputRecorded || !answer) return;\n    target.span.setAttribute(MLFLOW_SPAN_OUTPUTS_ATTR, answer.slice(0, TRACE_IO_LIMIT));\n    outputRecorded = true;\n  };\n  const recordFullOutput = (response: string): void => {\n    if (fullOutputRecorded || !response) return;\n    target.span.setAttribute(CHAT_RESPONSE_ATTR, response.slice(0, TRACE_IO_LIMIT));\n    fullOutputRecorded = true;\n  };\n  const recordGenie = (used: boolean): void => {\n    if (used) target.span.setAttribute(CHAT_GENIE_USED_ATTR, true);\n  };\n  const endOwnedSpan = (): void => {\n    if (!target.owned || ownedSpanEnded) return;\n    ownedSpanEnded = true;\n    target.span.end();\n  };\n\n  res.write = ((chunk: unknown, ...rest: unknown[]) => {\n    collector.write(chunk);\n    return passThroughWrite(chunk, ...rest);\n  }) as typeof res.write;\n\n  res.json = ((body?: unknown) => {\n    recordFullOutput(serialized(body));\n    recordGenie(valueUsesGenie(body));\n    recordOutput(assistantTextFromJson(body));\n    return passThroughJson(body);\n  }) as typeof res.json;\n\n  res.end = ((chunk?: unknown, ...rest: unknown[]) => {\n    collector.write(chunk);\n    recordOutput(collector.finish());\n    recordFullOutput(collector.rawBody());\n    recordGenie(collector.usedGenie());\n    try {\n      return passThroughEnd(chunk, ...rest);\n    } finally {\n      endOwnedSpan();\n    }\n  }) as typeof res.end;\n\n  res.once(\"close\", () => {\n    recordOutput(collector.finish());\n    recordFullOutput(collector.rawBody());\n    recordGenie(collector.usedGenie());\n    endOwnedSpan();\n  });\n\n  context.with(trace.setSpan(context.active(), target.span), next);\n}\n\n/**\n * Install {@link chatTurnTelemetryMiddleware} on a Mastra Express sub-app.\n *\n * Call before `MastraServer.init()` so the layer sits ahead of the agent\n * routes. Safe to call unconditionally: when no recording tracer is registered,\n * the middleware is a no-op.\n */\nexport function attachChatTurnTelemetry(\n  app: express.Express,\n  options: ChatTurnTelemetryOptions = {},\n): void {\n  app.use((req, res, next) => chatTurnTelemetryMiddleware(req, res, next, options));\n  logger.info(\"chat turn telemetry middleware attached\", options);\n}\n"]}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/agents.ts","../src/chart.ts","../src/chat.ts","../src/config.ts","../src/defaults.ts","../src/evaluation.ts","../src/filesystems.ts","../src/genie.ts","../src/identity.ts","../src/mcp.ts","../src/memory.ts","../src/mlflow.ts","../src/model.ts","../src/monty-sandbox.ts","../src/observability.ts","../src/plugin.ts","../src/processors.ts","../src/remote-skills.ts","../src/rest.ts","../src/sandbox.ts","../src/server.ts","../src/serving-sanitize.ts","../src/serving.ts","../src/skill-paths.ts","../src/statement.ts","../src/storage-schema.ts","../src/style.ts","../src/summarize.ts","../src/
|
|
1
|
+
{"root":["../src/agents.ts","../src/chart.ts","../src/chat.ts","../src/config.ts","../src/defaults.ts","../src/evaluation.ts","../src/filesystems.ts","../src/genie.ts","../src/identity.ts","../src/mcp.ts","../src/memory.ts","../src/mlflow.ts","../src/model.ts","../src/monty-sandbox.ts","../src/observability.ts","../src/plugin.ts","../src/processors.ts","../src/remote-skills.ts","../src/rest.ts","../src/sandbox.ts","../src/server.ts","../src/serving-sanitize.ts","../src/serving.ts","../src/skill-paths.ts","../src/statement.ts","../src/storage-schema.ts","../src/style.ts","../src/summarize.ts","../src/telemetry.ts","../src/validation.ts","../src/workspaces.ts","../src/writer.ts","../index.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -33,18 +33,18 @@
|
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@databricks/appkit": "0.81.0",
|
|
36
|
-
"@dbx-tools/appkit": "^0.9.
|
|
37
|
-
"@dbx-tools/core": "^0.9.
|
|
38
|
-
"@dbx-tools/databricks": "^0.9.
|
|
39
|
-
"@dbx-tools/fs": "^0.9.
|
|
40
|
-
"@dbx-tools/genie": "^0.9.
|
|
41
|
-
"@dbx-tools/model": "^0.9.
|
|
42
|
-
"@dbx-tools/path": "^0.9.
|
|
43
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
44
|
-
"@dbx-tools/shared-fs": "^0.9.
|
|
45
|
-
"@dbx-tools/shared-genie": "^0.9.
|
|
46
|
-
"@dbx-tools/shared-mastra": "^0.9.
|
|
47
|
-
"@dbx-tools/shared-model": "^0.9.
|
|
36
|
+
"@dbx-tools/appkit": "^0.9.43",
|
|
37
|
+
"@dbx-tools/core": "^0.9.43",
|
|
38
|
+
"@dbx-tools/databricks": "^0.9.43",
|
|
39
|
+
"@dbx-tools/fs": "^0.9.43",
|
|
40
|
+
"@dbx-tools/genie": "^0.9.43",
|
|
41
|
+
"@dbx-tools/model": "^0.9.43",
|
|
42
|
+
"@dbx-tools/path": "^0.9.43",
|
|
43
|
+
"@dbx-tools/shared-core": "^0.9.43",
|
|
44
|
+
"@dbx-tools/shared-fs": "^0.9.43",
|
|
45
|
+
"@dbx-tools/shared-genie": "^0.9.43",
|
|
46
|
+
"@dbx-tools/shared-mastra": "^0.9.43",
|
|
47
|
+
"@dbx-tools/shared-model": "^0.9.43",
|
|
48
48
|
"@mastra/ai-sdk": "1.10.5",
|
|
49
49
|
"@mastra/core": "1.71.0",
|
|
50
50
|
"@mastra/express": "1.5.15",
|
|
@@ -185,9 +185,9 @@
|
|
|
185
185
|
"types": "./lib/src/summarize.d.ts",
|
|
186
186
|
"default": "./lib/src/summarize.js"
|
|
187
187
|
},
|
|
188
|
-
"./
|
|
189
|
-
"types": "./lib/src/
|
|
190
|
-
"default": "./lib/src/
|
|
188
|
+
"./telemetry": {
|
|
189
|
+
"types": "./lib/src/telemetry.d.ts",
|
|
190
|
+
"default": "./lib/src/telemetry.js"
|
|
191
191
|
},
|
|
192
192
|
"./validation": {
|
|
193
193
|
"types": "./lib/src/validation.d.ts",
|
|
@@ -204,7 +204,7 @@
|
|
|
204
204
|
"./package.json": "./package.json"
|
|
205
205
|
}
|
|
206
206
|
},
|
|
207
|
-
"version": "0.9.
|
|
207
|
+
"version": "0.9.43",
|
|
208
208
|
"types": "./lib/index.d.ts",
|
|
209
209
|
"dbxToolsConfig": {
|
|
210
210
|
"tags": [
|
|
@@ -329,9 +329,9 @@
|
|
|
329
329
|
"types": "./lib/src/summarize.d.ts",
|
|
330
330
|
"default": "./lib/src/summarize.js"
|
|
331
331
|
},
|
|
332
|
-
"./
|
|
333
|
-
"types": "./lib/src/
|
|
334
|
-
"default": "./lib/src/
|
|
332
|
+
"./telemetry": {
|
|
333
|
+
"types": "./lib/src/telemetry.d.ts",
|
|
334
|
+
"default": "./lib/src/telemetry.js"
|
|
335
335
|
},
|
|
336
336
|
"./validation": {
|
|
337
337
|
"types": "./lib/src/validation.d.ts",
|
package/src/observability.ts
CHANGED
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
* `OTEL_PROPAGATORS=none` so Apps ingress `traceparent` does not hide
|
|
38
38
|
* every request-scoped root span from the UC `*_trace_unified` view.
|
|
39
39
|
* Chat request/response on that root span is stamped by
|
|
40
|
-
* `
|
|
40
|
+
* `telemetry.attachChatTurnTelemetry` (see `telemetry.ts`).
|
|
41
41
|
*
|
|
42
42
|
* @module
|
|
43
43
|
*/
|
package/src/plugin.ts
CHANGED
|
@@ -111,7 +111,7 @@ import {
|
|
|
111
111
|
} from "./server.ts";
|
|
112
112
|
import { resolveServingConfig } from "./serving.ts";
|
|
113
113
|
import { fetchStatementData, STATEMENT_ROW_CAP } from "./statement.ts";
|
|
114
|
-
import {
|
|
114
|
+
import { attachChatTurnTelemetry } from "./telemetry.ts";
|
|
115
115
|
import { invalidFields } from "./validation.ts";
|
|
116
116
|
|
|
117
117
|
const GENIE_MANIFEST = pluginRegistry.data(genie).plugin.manifest;
|
|
@@ -1133,7 +1133,10 @@ export class MastraPlugin extends Plugin<MastraPluginConfig> {
|
|
|
1133
1133
|
// `mastra.agent_run.*` attributes sit on a child span the view
|
|
1134
1134
|
// never reads). Must run before `MastraServer.init` so the layer
|
|
1135
1135
|
// sits ahead of the agent routes.
|
|
1136
|
-
|
|
1136
|
+
attachChatTurnTelemetry(this.mastraApp, {
|
|
1137
|
+
identity: (request) =>
|
|
1138
|
+
useServicePrincipal(this.identityMode, request) ? "service-principal" : "obo",
|
|
1139
|
+
});
|
|
1137
1140
|
this.mastraServer = new MastraServer(this.config, {
|
|
1138
1141
|
app: this.mastraApp,
|
|
1139
1142
|
mastra: this.mastra,
|