@mastra/observability 1.16.6-alpha.0 → 1.16.6-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @mastra/observability
 
+## 1.16.6-alpha.3
+
+### Patch Changes
+
+- Preserved the provider response model on completed model inference spans. ([#21154](https://github.com/mastra-ai/mastra/pull/21154))
+
+- Updated dependencies [[`2e4624e`](https://github.com/mastra-ai/mastra/commit/2e4624edb6917e61249cb60ee377735e7af7e4a9), [`e6534fa`](https://github.com/mastra-ai/mastra/commit/e6534fab031216f6cb48c4c9907cbfdce9d60bc6), [`7fdcaa6`](https://github.com/mastra-ai/mastra/commit/7fdcaa66105d64290f9b14432a12ec99f39c4d3a), [`cfd0d9e`](https://github.com/mastra-ai/mastra/commit/cfd0d9ec77ec3c69dd96f79cdb579e03d79f22ce), [`d9d93b2`](https://github.com/mastra-ai/mastra/commit/d9d93b25e4a65ad5fa153fa35be7ed149c8d587f)]:
+  - @mastra/core@1.58.0-alpha.12
+
+## 1.16.6-alpha.2
+
+### Patch Changes
+
+- Use Vercel AI Gateway reported costs for completed model generations when every step reports a valid cost. ([#19921](https://github.com/mastra-ai/mastra/pull/19921))
+
+- Updated dependencies [[`cdd5c33`](https://github.com/mastra-ai/mastra/commit/cdd5c33ac6c7118a9f139e6dc0e14e6a8ae31658), [`d7cf7fa`](https://github.com/mastra-ai/mastra/commit/d7cf7fafc1ae1b50bd8462dd0e6c671a8606db93), [`0f9a448`](https://github.com/mastra-ai/mastra/commit/0f9a448502157e59f7b76f24360ad497168f5ef8), [`289f4ce`](https://github.com/mastra-ai/mastra/commit/289f4ce16e3293370440172132c52ee787cbc09f), [`4f16ff8`](https://github.com/mastra-ai/mastra/commit/4f16ff824bf2f9b0ddc93f210477c10c8a4fb1ab), [`1c67d85`](https://github.com/mastra-ai/mastra/commit/1c67d85e9da8285662f4dbbf47e0378c3fee0747), [`ba24be6`](https://github.com/mastra-ai/mastra/commit/ba24be662439c331ab23a600041f93803c89eca8), [`842b5fe`](https://github.com/mastra-ai/mastra/commit/842b5fe22b6a7fa811bd14e48eb9af523ac989f2), [`80bdf3a`](https://github.com/mastra-ai/mastra/commit/80bdf3ae16ade6ff63bde0cb16fa2df8ab7dd4dd), [`9ba1247`](https://github.com/mastra-ai/mastra/commit/9ba12470c77f1c03642d720ce67e517e878f666e), [`fd96298`](https://github.com/mastra-ai/mastra/commit/fd96298a8367622f4ebfcaa97b5b6c1fbbd14564), [`6a84954`](https://github.com/mastra-ai/mastra/commit/6a84954a2667f85b6d59da652dab1bbff007ccb0), [`52d8ef0`](https://github.com/mastra-ai/mastra/commit/52d8ef03801f1deb7ee48532fc4190dd4a33916c), [`cdd5c33`](https://github.com/mastra-ai/mastra/commit/cdd5c33ac6c7118a9f139e6dc0e14e6a8ae31658), [`efd5c81`](https://github.com/mastra-ai/mastra/commit/efd5c81cc25fde3c2ddd86fc1178deb4ec176e19), [`0976933`](https://github.com/mastra-ai/mastra/commit/0976933142333ec78451feef265b68bcb45aa5e7), [`242b945`](https://github.com/mastra-ai/mastra/commit/242b94558777bfbdeb42cbfea84afff0b6ad0633), [`fea5cae`](https://github.com/mastra-ai/mastra/commit/fea5caedc7e2cfea51784a15e015952692027abf), [`4b59f78`](https://github.com/mastra-ai/mastra/commit/4b59f786cbc9a7d1ef07a07517dbd4b96865e99d), [`7010c5d`](https://github.com/mastra-ai/mastra/commit/7010c5d15728bf9c5dfe4fb6b1bf80ce23bf143a)]:
+  - @mastra/core@1.58.0-alpha.3
+
+## 1.16.6-alpha.1
+
+### Patch Changes
+
+- Fixed span exports when `excludeSpanTypes` removes a parent span. Descendant spans now use the nearest exported parent, so exporters retain tool calls. ([#20881](https://github.com/mastra-ai/mastra/pull/20881))
+
+- Updated dependencies [[`b4c89b4`](https://github.com/mastra-ai/mastra/commit/b4c89b4371b0c86da57403ad1a3b3ef0681f3128), [`e44e8f3`](https://github.com/mastra-ai/mastra/commit/e44e8f370b66c339ddcaba946d33da6d3c3f06cd), [`c967a5e`](https://github.com/mastra-ai/mastra/commit/c967a5eec150c5dc5418c4a4388982d1fb7ad27c), [`f53d5bd`](https://github.com/mastra-ai/mastra/commit/f53d5bd4885b29e4ac29a428a6044088ea8d6aa3), [`bda2235`](https://github.com/mastra-ai/mastra/commit/bda22353ee28f2df0eaea555f7cae1549f979c0b), [`a7eb4a1`](https://github.com/mastra-ai/mastra/commit/a7eb4a11450f6170274ed5141bffe821d4fdd5a6), [`2f9ef3f`](https://github.com/mastra-ai/mastra/commit/2f9ef3f4ca06fc2dcdd5088c26b7f4da6a016791), [`e7eefcb`](https://github.com/mastra-ai/mastra/commit/e7eefcb162cda7c493e8c3bf43050ead0efbcb2c), [`4d7aca2`](https://github.com/mastra-ai/mastra/commit/4d7aca2fe75f225c83d1502d63079568e6ec163f), [`c4ec889`](https://github.com/mastra-ai/mastra/commit/c4ec889561c0264c43f66d04d587bee4ce35e792), [`9be8878`](https://github.com/mastra-ai/mastra/commit/9be8878dcf0388e84fc4873e0eec27bd49b881a4)]:
+  - @mastra/core@1.58.0-alpha.2
+
 ## 1.16.6-alpha.0
 
 ### Patch Changes

package/dist/index.cjs

@@ -1784,6 +1784,34 @@ function addUsageStats(a, b) {
 function supportsModelInference() {
 	return _mastra_core_features.coreFeatures.has("model-inference-span");
 }
+function parseGatewayCost(providerMetadata) {
+	const rawCost = providerMetadata?.gateway?.cost;
+	const cost = typeof rawCost === "number" ? rawCost : typeof rawCost === "string" && rawCost.trim().length > 0 ? Number(rawCost) : void 0;
+	return typeof cost === "number" && Number.isFinite(cost) && cost >= 0 ? cost : void 0;
+}
+function getGatewayCostContext({ stepProviderMetadata }) {
+	if (!stepProviderMetadata) return;
+	if (!stepProviderMetadata.some((metadata) => metadata?.gateway !== void 0)) return;
+	const costs = [];
+	for (const metadata of stepProviderMetadata) {
+		const cost = parseGatewayCost(metadata);
+		if (cost === void 0) return;
+		costs.push(cost);
+	}
+	const estimatedCost = costs.reduce((total, cost) => total + cost, 0);
+	if (!Number.isFinite(estimatedCost)) return;
+	return {
+		estimatedCost,
+		costUnit: "USD",
+		costMetadata: {
+			source: "provider_reported",
+			sdkProvider: "vercel_ai_gateway",
+			sdkCostField: "gateway.cost",
+			scope: "query_total",
+			reportedStepCount: costs.length
+		}
+	};
+}
 function formatPreviewLabel(label, fallback) {
 	return typeof label === "string" && label.length > 0 ? label : fallback;
 }
@@ -1965,10 +1993,11 @@ var ModelSpanTracker = class {
 	* If usage is provided, it will be converted to UsageStats with cache token details.
 	*/
 	endGeneration(options) {
-		const { usage, providerMetadata, ...spanOptions } = options ?? {};
+		const { usage, providerMetadata, stepProviderMetadata, ...spanOptions } = options ?? {};
 		if (spanOptions.attributes) {
 			spanOptions.attributes.completionStartTime = this.#completionStartTime;
 			spanOptions.attributes.usage = extractUsageMetrics(usage, providerMetadata);
+			if (!spanOptions.attributes.costContext) spanOptions.attributes.costContext = getGatewayCostContext({ stepProviderMetadata });
 		}
 		this.#modelSpan?.end(spanOptions);
 	}
@@ -2052,13 +2081,15 @@ var ModelSpanTracker = class {
 		if (!this.#currentInferenceSpan) return;
 		const { usage: rawUsage, ...otherOutput } = payload.output;
 		const usage = extractUsageMetrics(rawUsage, payload.metadata?.providerMetadata);
+		const responseModel = typeof payload.metadata?.modelId === "string" ? payload.metadata.modelId : void 0;
 		this.#currentInferenceSpan.end({
 			output: otherOutput,
 			attributes: {
 				usage,
 				finishReason: payload.stepResult.reason,
 				warnings: payload.stepResult.warnings,
-				completionStartTime: this.#completionStartTime
+				completionStartTime: this.#completionStartTime,
+				...responseModel?.trim() ? { responseModel } : {}
 			}
 		});
 		this.#currentInferenceSpan = void 0;
@@ -2456,12 +2487,12 @@ function isSpanInternal(spanType, flags) {
 /**
 * Get the external parent span ID from CreateSpanOptions.
 *
-* If the parent is internal, walks up the parent chain to find
-* the closest external ancestor. If the parent is already external,
-* returns its ID directly.
+* If the parent is internal or excluded from export (`excludeSpanTypes`),
+* walks up the parent chain to find the closest exported ancestor.
+* If the parent is already exportable, returns its ID directly.
 *
 * This is useful when exporting spans to external observability systems
-* that shouldn't include internal framework spans.
+* that shouldn't include internal framework spans or excluded types.
 *
 * @param options - Span creation options
 * @returns The external parent span ID, or undefined if no external parent exists
@@ -2482,8 +2513,9 @@ function isSpanInternal(spanType, flags) {
 */
 function getExternalParentId(options) {
 	if (!options.parent) return;
-	if (options.parent.isInternal) return options.parent.getParentSpanId(false);
-	else return options.parent.id;
+	const parent = options.parent;
+	if (parent.isInternal || parent.isExcluded) return parent.getParentSpanId(false);
+	return parent.id;
 }
 var BaseSpan = class {
 	name;
@@ -2522,6 +2554,10 @@ var BaseSpan = class {
 	* when the span is internal and includeInternalSpans is false, or when
 	* the subclass is always excluded (e.g., NoOpSpan).
 	*
+	* Public so parent-chain walks (`getParentSpan`) can skip ancestors that
+	* exporters will never receive — otherwise descendants export a
+	* `parentSpanId` pointing at a dropped span and become orphans.
+	*
 	* Note: metadata is still attached and deepCleaned because it is read in
 	* process by getCorrelationContext() and by getLoggerContext() /
 	* getMetricsContext() (which structuredClone it).
@@ -2593,14 +2629,20 @@ var BaseSpan = class {
 	get isRootSpan() {
 		return !this.parent;
 	}
-	/** Get the closest parent span, optionally skipping internal spans */
+	/**
+	* Get the closest parent span.
+	* Always skips ancestors dropped by `excludeSpanTypes` (`isExcluded`), so
+	* exported `parentSpanId` values never point at spans exporters omit.
+	* When `includeInternalSpans` is false/undefined, also skips `isInternal`
+	* ancestors.
+	*/
 	getParentSpan(includeInternalSpans) {
 		if (!this.parent) return;
-		if (includeInternalSpans) return this.parent;
-		if (this.parent.isInternal) return this.parent.getParentSpan(includeInternalSpans);
+		const parent = this.parent;
+		if (parent.isExcluded || !includeInternalSpans && parent.isInternal) return parent.getParentSpan(includeInternalSpans);
 		return this.parent;
 	}
-	/** Get the closest parent spanId that isn't an internal span */
+	/** Get the closest parent spanId that will reach exporters (unless includeInternalSpans) */
 	getParentSpanId(includeInternalSpans) {
 		if (!this.parent) return this.parentSpanId;
 		const parentSpan = this.getParentSpan(includeInternalSpans);