@mastra/observability 1.16.4 → 1.16.6-alpha.0

package/dist/index.js

@@ -929,6 +929,12 @@ function cloneCostContext(costContext) {
 	};
 }
 //#endregion
+//#region src/model-id.ts
+/** Return the first model id that contains non-whitespace characters. */
+function resolveModelId(...candidates) {
+	return candidates.find((candidate) => candidate?.trim());
+}
+//#endregion
 //#region src/metrics/pricing-model.ts
 var PricingTier = class {
 	index;
@@ -1505,7 +1511,7 @@ function emitUsageMetrics(attrs, usage, metrics) {
 	if (providedCostContext) metricCosts = providedCostContext;
 	else try {
 		const provider = attrs.provider;
-		const model = attrs.responseModel ?? attrs.model;
+		const model = resolveModelId(attrs.responseModel, attrs.model);
 		if (provider && model) {
 			metricCosts = estimateCosts({
 				provider,
@@ -1542,7 +1548,7 @@ function getProvidedCostContext(attrs, usage) {
 	if (typeof costContext?.estimatedCost !== "number") return;
 	const carrierMetric = usage.inputTokens !== void 0 ? TokenMetrics.TOTAL_INPUT : TokenMetrics.TOTAL_OUTPUT;
 	const provider = costContext.provider ?? attrs.provider;
-	const model = costContext.model ?? attrs.responseModel ?? attrs.model;
+	const model = resolveModelId(costContext.model, attrs.responseModel, attrs.model);
 	const contexts = /* @__PURE__ */ new Map();
 	for (const sample of getTokenMetricSamples(usage)) contexts.set(sample.name, {
 		provider,
@@ -2974,7 +2980,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 		});
 		if (rest.type === SpanType.MODEL_GENERATION && this.config.excludeSpanTypes?.includes(SpanType.MODEL_GENERATION)) {
 			const attrs = rest.attributes;
-			const model = attrs?.responseModel ?? attrs?.model;
+			const model = resolveModelId(attrs?.responseModel, attrs?.model);
 			if (attrs?.provider || model) this.#excludedModelMeta.set(span, {
 				provider: attrs?.provider,
 				model
@@ -3377,7 +3383,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 			ancestor,
 			usage,
 			provider: endAttrs?.provider ?? liveAttrs?.provider,
-			model: endAttrs?.responseModel ?? endAttrs?.model ?? liveAttrs?.responseModel ?? liveAttrs?.model
+			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model)
 		};
 	}
 	/**
@@ -3399,7 +3405,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 		return {
 			usage,
 			provider: endAttrs?.provider ?? liveAttrs?.provider ?? stashed?.provider,
-			model: endAttrs?.responseModel ?? endAttrs?.model ?? liveAttrs?.responseModel ?? liveAttrs?.model ?? stashed?.model
+			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model, stashed?.model)
 		};
 	}
 	/**
@@ -8690,6 +8696,23 @@ function isInstance(obj) {
 	return obj instanceof BaseObservabilityInstance;
 }
 /**
+* Delays (ms) between attempts to rehydrate a trace from storage when an
+* annotation (score/feedback) targets a span that has not been flushed by
+* the configured exporters yet. Exporters buffer and flush asynchronously:
+* by default they flush at 1000 spans or after a 5000ms wait
+* (`maxBatchWaitMs`), so an annotation emitted right after a span ends can
+* race the flush and be silently dropped. The schedule below sums to
+* ~5.85s, covering the default flush interval with margin.
+*/
+const RECORDED_TRACE_LOOKUP_RETRY_DELAYS_MS = [
+	100,
+	250,
+	500,
+	1e3,
+	2e3,
+	2e3
+];
+/**
 * Top-level observability entrypoint. Manages a registry of ObservabilityInstance
 * configurations and provides instance selection via config selectors.
 */
@@ -8846,14 +8869,15 @@ var Observability = class extends MastraBase {
 			return;
 		}
 		if (!args.traceId) return;
-		const trace = await this.#getStoredTrace(args.traceId);
-		if (!trace) return;
-		const event = buildRecordedScoreEventFromTrace({
+		const event = await this.#buildRecordedEventWithRetry(args.traceId, (trace) => buildRecordedScoreEventFromTrace({
 			trace,
 			spanId: args.spanId,
 			score: args.score
-		});
-		if (!event) return;
+		}));
+		if (!event) {
+			this.logger?.warn(`Score event was dropped because the target trace/span was not found in observability storage (traceId: ${args.traceId}, spanId: ${args.spanId})`);
+			return;
+		}
 		await this.#emitRecordedEvent(event);
 	}
 	async addFeedback(args) {
@@ -8869,14 +8893,15 @@ var Observability = class extends MastraBase {
 			return;
 		}
 		if (!args.traceId) return;
-		const trace = await this.#getStoredTrace(args.traceId);
-		if (!trace) return;
-		const event = buildRecordedFeedbackEventFromTrace({
+		const event = await this.#buildRecordedEventWithRetry(args.traceId, (trace) => buildRecordedFeedbackEventFromTrace({
 			trace,
 			spanId: args.spanId,
 			feedback: args.feedback
-		});
-		if (!event) return;
+		}));
+		if (!event) {
+			this.logger?.warn(`Feedback event was dropped because the target trace/span was not found in observability storage (traceId: ${args.traceId}, spanId: ${args.spanId})`);
+			return;
+		}
 		await this.#emitRecordedEvent(event);
 	}
 	/** Register a named observability instance, optionally marking it as default. */
@@ -8941,6 +8966,20 @@ var Observability = class extends MastraBase {
 		if (!storage) return null;
 		return await storage.getStore("observability") ?? null;
 	}
+	/**
+	* Build a recorded score/feedback event from storage, retrying briefly to
+	* ride out the async exporter flush: annotations emitted right after a
+	* span ends can otherwise race the flush and be silently dropped.
+	*/
+	async #buildRecordedEventWithRetry(traceId, build) {
+		for (const delayMs of [0, ...RECORDED_TRACE_LOOKUP_RETRY_DELAYS_MS]) {
+			if (delayMs > 0) await new Promise((resolve) => setTimeout(resolve, delayMs));
+			const trace = await this.#getStoredTrace(traceId);
+			const event = trace ? build(trace) : null;
+			if (event) return event;
+		}
+		return null;
+	}
 	async #getStoredTrace(traceId) {
 		const observabilityStorage = await this.#getObservabilityStorage();
 		if (!observabilityStorage) return null;