@mastra/datadog 1.2.1-alpha.1 → 1.2.1-alpha.3

package/dist/index.js

@@ -98,7 +98,7 @@ function toDate(value) {
 }
 function safeStringify(data) {
   try {
-    return JSON.stringify(data);
+    return JSON.stringify(data) ?? "";
   } catch {
     if (typeof data === "object" && data !== null) {
       return `[Non-serializable ${data.constructor?.name || "Object"}]`;
@@ -107,15 +107,50 @@ function safeStringify(data) {
   }
 }
 function isMessageArray(data) {
-  return Array.isArray(data) && data.every((m) => m?.role && m?.content !== void 0);
+  return Array.isArray(data) && data.every((m) => m?.role && (m?.content !== void 0 || Array.isArray(m.toolCalls)));
+}
+function isModelDataSpan(spanType) {
+  return spanType === SpanType.MODEL_GENERATION || spanType === SpanType.MODEL_STEP || spanType === SpanType.MODEL_INFERENCE;
 }
 function isGeminiContentArray(data) {
   return Array.isArray(data) && data.every((m) => m?.role && Array.isArray(m?.parts));
 }
+function toMessageContent(content) {
+  return typeof content === "string" ? content : safeStringify(content);
+}
 function toDatadogMessages(messages) {
-  return messages.map((m) => ({
-    role: m.role,
-    content: typeof m.content === "string" ? m.content : safeStringify(m.content)
+  return messages.map((m) => {
+    const message = {
+      role: m.role,
+      content: m.content == null ? "" : toMessageContent(m.content)
+    };
+    if (m.toolCalls) {
+      message.toolCalls = m.toolCalls;
+    }
+    return message;
+  }).filter((m) => !(m.role === "user" && m.content.trim().length === 0));
+}
+function parseToolArguments(args) {
+  if (args == null) return void 0;
+  if (typeof args === "string") {
+    try {
+      const parsed = JSON.parse(args);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        return parsed;
+      }
+    } catch {
+    }
+    return { value: args };
+  }
+  if (typeof args === "object" && !Array.isArray(args)) return args;
+  return { value: args };
+}
+function toDatadogToolCalls(toolCalls) {
+  return toolCalls.map((c) => ({
+    name: c?.toolName ?? c?.name ?? c?.function?.name ?? "unknown",
+    arguments: parseToolArguments(c?.args ?? c?.input ?? c?.function?.arguments),
+    toolId: c?.toolCallId ?? c?.toolId ?? c?.id,
+    type: c?.type === "function" ? c.type : "function"
   }));
 }
 function geminiContentToMessage(item) {
@@ -129,34 +164,34 @@ function geminiContentToMessage(item) {
   return { role: item.role, content: text };
 }
 function formatInput(input, spanType) {
-  if (spanType === SpanType.MODEL_GENERATION || spanType === SpanType.MODEL_STEP) {
+  if (isModelDataSpan(spanType)) {
     if (isMessageArray(input)) {
       return toDatadogMessages(input);
     }
     if (isGeminiContentArray(input)) {
-      return input.map(geminiContentToMessage);
+      return toDatadogMessages(input.map(geminiContentToMessage));
     }
     if (input && typeof input === "object" && !Array.isArray(input)) {
       if (isMessageArray(input.messages)) {
         return toDatadogMessages(input.messages);
       }
       if (isGeminiContentArray(input.messages)) {
-        return input.messages.map(geminiContentToMessage);
+        return toDatadogMessages(input.messages.map(geminiContentToMessage));
       }
       if (isGeminiContentArray(input.contents)) {
-        return input.contents.map(geminiContentToMessage);
+        return toDatadogMessages(input.contents.map(geminiContentToMessage));
       }
     }
     if (typeof input === "string") {
-      return [{ role: "user", content: input }];
+      return toDatadogMessages([{ role: "user", content: input }]);
     }
-    return [{ role: "user", content: safeStringify(input) }];
+    return toDatadogMessages([{ role: "user", content: safeStringify(input) }]);
   }
   if (typeof input === "string" || Array.isArray(input)) return input;
   return safeStringify(input);
 }
 function formatOutput(output, spanType) {
-  if (spanType === SpanType.MODEL_GENERATION || spanType === SpanType.MODEL_STEP) {
+  if (isModelDataSpan(spanType)) {
     if (isMessageArray(output)) {
       return toDatadogMessages(output);
     }
@@ -164,16 +199,21 @@ function formatOutput(output, spanType) {
       return [{ role: "assistant", content: output }];
     }
     if (output && typeof output === "object") {
+      if (Array.isArray(output.toolCalls) && output.toolCalls.length > 0) {
+        return [
+          {
+            role: "assistant",
+            content: typeof output.text === "string" ? output.text : "",
+            toolCalls: toDatadogToolCalls(output.toolCalls)
+          }
+        ];
+      }
       if (typeof output.text === "string" && output.text.length > 0) {
         return [{ role: "assistant", content: output.text }];
       }
       if (output.object !== void 0) {
         return [{ role: "assistant", content: safeStringify(output.object) }];
       }
-      if (Array.isArray(output.toolCalls) && output.toolCalls.length > 0) {
-        const summary = output.toolCalls.map((c) => `[tool: ${c?.toolName ?? c?.name ?? "unknown"}]`).join("");
-        return [{ role: "assistant", content: summary }];
-      }
     }
     return [{ role: "assistant", content: safeStringify(output) }];
   }