@mastra/observability 1.7.0 → 1.7.1

package/dist/index.js

@@ -15960,7 +15960,8 @@ var TestExporter = class extends BaseExporter {
     this.#trackEvent("score");
     if (this.#config.storeLogs) {
       const score = event.score;
-      const logMessage = `[TestExporter] score: ${score.scorerId}=${score.score} (trace: ${score.traceId.slice(-8)}${score.spanId ? `, span: ${score.spanId.slice(-8)}` : ""})`;
+      const traceLabel = score.traceId ? score.traceId.slice(-8) : "unanchored";
+      const logMessage = `[TestExporter] score: ${score.scorerId}=${score.score} (trace: ${traceLabel}${score.spanId ? `, span: ${score.spanId.slice(-8)}` : ""})`;
       this.#debugLogs.push(logMessage);
     }
     this.#scoreEvents.push(event);
@@ -15972,7 +15973,9 @@ var TestExporter = class extends BaseExporter {
     this.#trackEvent("feedback");
     if (this.#config.storeLogs) {
       const fb = event.feedback;
-      const logMessage = `[TestExporter] feedback: ${fb.feedbackType} from ${fb.source}=${fb.value} (trace: ${fb.traceId.slice(-8)}${fb.spanId ? `, span: ${fb.spanId.slice(-8)}` : ""})`;
+      const traceLabel = fb.traceId ? fb.traceId.slice(-8) : "unanchored";
+      const feedbackSource = fb.feedbackSource ?? fb.source;
+      const logMessage = `[TestExporter] feedback: ${fb.feedbackType} from ${feedbackSource}=${fb.value} (trace: ${traceLabel}${fb.spanId ? `, span: ${fb.spanId.slice(-8)}` : ""})`;
       this.#debugLogs.push(logMessage);
     }
     this.#feedbackEvents.push(event);
@@ -16122,10 +16125,14 @@ var TestExporter = class extends BaseExporter {
       if (event.log.traceId) traceIds.add(event.log.traceId);
     }
     for (const event of this.#scoreEvents) {
-      traceIds.add(event.score.traceId);
+      if (event.score.traceId) {
+        traceIds.add(event.score.traceId);
+      }
     }
     for (const event of this.#feedbackEvents) {
-      traceIds.add(event.feedback.traceId);
+      if (event.feedback.traceId) {
+        traceIds.add(event.feedback.traceId);
+      }
     }
     return Array.from(traceIds);
   }
@@ -17428,7 +17435,14 @@ var PricingRegistry = class _PricingRegistry {
     return _PricingRegistry.globalRegistry;
   }
   get(args) {
-    return this.pricingModels.get(makePricingKey(args)) ?? null;
+    const key = makePricingKey(args);
+    const exact = this.pricingModels.get(key);
+    if (exact) return exact;
+    const dashedKey = makePricingKey({ provider: args.provider, model: args.model.replace(/\./g, "-") });
+    if (dashedKey !== key) {
+      return this.pricingModels.get(dashedKey) ?? null;
+    }
+    return null;
   }
 };
 function loadPricingModels() {
@@ -18881,15 +18895,22 @@ var DefaultSpan = class extends BaseSpan {
       return;
     }
     const { error: error48, endSpan = true, attributes, metadata } = options;
-    this.errorInfo = error48 instanceof MastraError ? {
-      id: error48.id,
-      details: error48.details,
-      category: error48.category,
-      domain: error48.domain,
-      message: error48.message
-    } : {
-      message: error48.message
-    };
+    this.errorInfo = deepClean(
+      error48 instanceof MastraError ? {
+        id: error48.id,
+        details: error48.details,
+        category: error48.category,
+        domain: error48.domain,
+        message: error48.message,
+        name: error48.name,
+        stack: error48.stack
+      } : {
+        message: error48.message,
+        name: error48.name,
+        stack: error48.stack
+      },
+      this.deepCleanOptions
+    );
     if (attributes) {
       this.attributes = { ...this.attributes, ...deepClean(attributes, this.deepCleanOptions) };
     }
@@ -19555,6 +19576,8 @@ function normalizeErrorInfo(error48) {
   return {
     message: error48.message,
     id: "id" in error48 && typeof error48.id === "string" ? error48.id : void 0,
+    name: "name" in error48 && typeof error48.name === "string" ? error48.name : void 0,
+    stack: "stack" in error48 && typeof error48.stack === "string" ? error48.stack : void 0,
     domain: "domain" in error48 && typeof error48.domain === "string" ? error48.domain : void 0,
     category: "category" in error48 && typeof error48.category === "string" ? error48.category : void 0,
     details: "details" in error48 && error48.details && typeof error48.details === "object" ? error48.details : void 0
@@ -19585,13 +19608,13 @@ function buildCorrelationContext(span, rootSpan, parent) {
     experimentId: nullToUndefined(span.experimentId)
   };
 }
-function buildRecordedScoreEvent(args) {
-  const { span, rootSpan, parent, score, spanId } = args;
+function buildScoreEvent(args) {
+  const { traceId, spanId, correlationContext, score, inheritedMetadata } = args;
   return {
     type: "score",
     score: {
       timestamp: /* @__PURE__ */ new Date(),
-      traceId: span.traceId,
+      traceId,
       spanId,
       scorerId: score.scorerId,
       scorerVersion: score.scorerVersion,
@@ -19601,18 +19624,18 @@ function buildRecordedScoreEvent(args) {
       reason: score.reason,
       experimentId: score.experimentId,
       scoreTraceId: score.scoreTraceId,
-      correlationContext: buildCorrelationContext(span, rootSpan, parent),
-      metadata: mergeMetadata(span.metadata, score.metadata)
+      correlationContext,
+      metadata: mergeMetadata(inheritedMetadata, score.metadata)
     }
   };
 }
-function buildRecordedFeedbackEvent(args) {
-  const { span, rootSpan, parent, feedback, spanId } = args;
+function buildFeedbackEvent(args) {
+  const { traceId, spanId, correlationContext, feedback, inheritedMetadata } = args;
   return {
     type: "feedback",
     feedback: {
       timestamp: /* @__PURE__ */ new Date(),
-      traceId: span.traceId,
+      traceId,
       spanId,
       source: feedback.source,
       feedbackSource: feedback.feedbackSource,
@@ -19623,8 +19646,8 @@ function buildRecordedFeedbackEvent(args) {
       comment: feedback.comment,
       sourceId: feedback.sourceId,
       experimentId: feedback.experimentId,
-      correlationContext: buildCorrelationContext(span, rootSpan, parent),
-      metadata: mergeMetadata(span.metadata, feedback.metadata)
+      correlationContext,
+      metadata: mergeMetadata(inheritedMetadata, feedback.metadata)
     }
   };
 }
@@ -19638,12 +19661,12 @@ function buildRecordedScoreEventFromTrace(args) {
   const span = args.spanId ? findSpanById(args.trace.spans, args.spanId) : rootSpan;
   if (!span) return null;
   const parent = span.parentSpanId ? findSpanById(args.trace.spans, span.parentSpanId) : void 0;
-  return buildRecordedScoreEvent({
-    span,
-    rootSpan,
-    parent,
+  return buildScoreEvent({
+    traceId: span.traceId,
+    spanId: args.spanId,
+    correlationContext: buildCorrelationContext(span, rootSpan, parent),
     score: args.score,
-    spanId: args.spanId
+    inheritedMetadata: span.metadata
   });
 }
 function buildRecordedFeedbackEventFromTrace(args) {
@@ -19652,12 +19675,12 @@ function buildRecordedFeedbackEventFromTrace(args) {
   const span = args.spanId ? findSpanById(args.trace.spans, args.spanId) : rootSpan;
   if (!span) return null;
   const parent = span.parentSpanId ? findSpanById(args.trace.spans, span.parentSpanId) : void 0;
-  return buildRecordedFeedbackEvent({
-    span,
-    rootSpan,
-    parent,
+  return buildFeedbackEvent({
+    traceId: span.traceId,
+    spanId: args.spanId,
+    correlationContext: buildCorrelationContext(span, rootSpan, parent),
     feedback: args.feedback,
-    spanId: args.spanId
+    inheritedMetadata: span.metadata
   });
 }
 var RecordedSpanImpl = class {
@@ -19720,12 +19743,12 @@ var RecordedSpanImpl = class {
       return;
     }
     await this.#emitRecordedEvent(
-      buildRecordedScoreEvent({
-        span: this.#raw,
-        rootSpan: this.#rootSpan,
-        parent: this.parent,
+      buildScoreEvent({
+        traceId: this.#raw.traceId,
+        spanId: this.id,
+        correlationContext: buildCorrelationContext(this.#raw, this.#rootSpan, this.parent),
         score,
-        spanId: this.id
+        inheritedMetadata: this.#raw.metadata
       })
     );
   }
@@ -19735,12 +19758,12 @@ var RecordedSpanImpl = class {
       return;
     }
     await this.#emitRecordedEvent(
-      buildRecordedFeedbackEvent({
-        span: this.#raw,
-        rootSpan: this.#rootSpan,
-        parent: this.parent,
+      buildFeedbackEvent({
+        traceId: this.#raw.traceId,
+        spanId: this.id,
+        correlationContext: buildCorrelationContext(this.#raw, this.#rootSpan, this.parent),
         feedback,
-        spanId: this.id
+        inheritedMetadata: this.#raw.metadata
       })
     );
   }
@@ -19773,10 +19796,11 @@ var RecordedTraceImpl = class {
       return;
     }
     await this.#emitRecordedEvent(
-      buildRecordedScoreEvent({
-        span: this.#rootRecord,
-        rootSpan: this.#rootRecord,
-        score
+      buildScoreEvent({
+        traceId: this.#rootRecord.traceId,
+        correlationContext: buildCorrelationContext(this.#rootRecord, this.#rootRecord),
+        score,
+        inheritedMetadata: this.#rootRecord.metadata
       })
     );
   }
@@ -19786,10 +19810,11 @@ var RecordedTraceImpl = class {
       return;
     }
     await this.#emitRecordedEvent(
-      buildRecordedFeedbackEvent({
-        span: this.#rootRecord,
-        rootSpan: this.#rootRecord,
-        feedback
+      buildFeedbackEvent({
+        traceId: this.#rootRecord.traceId,
+        correlationContext: buildCorrelationContext(this.#rootRecord, this.#rootRecord),
+        feedback,
+        inheritedMetadata: this.#rootRecord.metadata
       })
     );
   }
@@ -20211,6 +20236,22 @@ var Observability = class extends MastraBase {
     });
   }
   async addScore(args) {
+    const targetTraceId = args.traceId ?? args.correlationContext?.traceId;
+    const targetSpanId = args.spanId ?? args.correlationContext?.spanId;
+    if (args.correlationContext) {
+      await this.#emitRecordedEvent(
+        buildScoreEvent({
+          ...targetTraceId ? { traceId: targetTraceId } : {},
+          ...targetSpanId ? { spanId: targetSpanId } : {},
+          correlationContext: args.correlationContext,
+          score: args.score
+        })
+      );
+      return;
+    }
+    if (!args.traceId) {
+      return;
+    }
     const trace = await this.#getStoredTrace(args.traceId);
     if (!trace) {
       return;
@@ -20226,6 +20267,22 @@ var Observability = class extends MastraBase {
     await this.#emitRecordedEvent(event);
   }
   async addFeedback(args) {
+    const targetTraceId = args.traceId ?? args.correlationContext?.traceId;
+    const targetSpanId = args.spanId ?? args.correlationContext?.spanId;
+    if (args.correlationContext) {
+      await this.#emitRecordedEvent(
+        buildFeedbackEvent({
+          ...targetTraceId ? { traceId: targetTraceId } : {},
+          ...targetSpanId ? { spanId: targetSpanId } : {},
+          correlationContext: args.correlationContext,
+          feedback: args.feedback
+        })
+      );
+      return;
+    }
+    if (!args.traceId) {
+      return;
+    }
     const trace = await this.#getStoredTrace(args.traceId);
     if (!trace) {
       return;