@mastra/observability 1.16.4 → 1.16.5

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)
 		};
 	}
 	/**