@mastra/observability 1.18.3 → 1.18.4-alpha.1

package/dist/index.js

@@ -1384,6 +1384,13 @@ const PricingMeter = {
 	OUTPUT_IMAGE_TOKENS: "output_image_tokens",
 	OUTPUT_REASONING_TOKENS: "output_reasoning_tokens"
 };
+/**
+* Local copy of `TokenMetrics` from `@mastra/core/observability`. Core added that export after
+* this package's minimum core version, so re-exporting it would raise the peer floor here and in
+* every exporter that depends on this package. `types.test.ts` keeps the two copies identical.
+*
+* TODO(mastra-v2): replace this with `export { TokenMetrics } from '@mastra/core/observability'`.
+*/
 const TokenMetrics = {
 	TOTAL_INPUT: "mastra_model_total_input_tokens",
 	TOTAL_OUTPUT: "mastra_model_total_output_tokens",
@@ -1696,10 +1703,11 @@ function emitTokenMetrics(span, metrics) {
 * ancestor span: the metric labels come from the ancestor's context, the
 * cost calculation still uses the original model that incurred the tokens.
 */
-function emitTokenMetricsForUsage(usage, provider, model, metrics) {
+function emitTokenMetricsForUsage(usage, provider, model, usageIncomplete, metrics) {
 	emitUsageMetrics({
 		provider,
-		model
+		model,
+		usageIncomplete
 	}, usage, metrics);
 }
 /** Emit all auto-extracted metrics for a live span end. */
@@ -1733,13 +1741,14 @@ function emitUsageMetrics(attrs, usage, metrics) {
 	} catch {
 		metricCosts = /* @__PURE__ */ new Map();
 	}
+	const labels = attrs.usageIncomplete ? { usageIncomplete: "true" } : void 0;
 	const emit = (name, value) => {
 		const costContext = metricCosts.get(name);
 		if (!costContext) {
-			metrics.emit(name, value);
+			metrics.emit(name, value, labels);
 			return;
 		}
-		metrics.emit(name, value, void 0, { costContext });
+		metrics.emit(name, value, labels, { costContext });
 	};
 	for (const sample of getTokenMetricSamples(usage)) emit(sample.name, sample.value);
 }
@@ -2428,6 +2437,7 @@ var ModelSpanTracker = class {
 				...ctx?.parameters !== void 0 ? { parameters: ctx.parameters } : {},
 				...ctx?.providerOptions !== void 0 ? { providerOptions: ctx.providerOptions } : {},
 				...ctx?.availableTools !== void 0 ? { availableTools: ctx.availableTools } : {},
+				...ctx?.tools !== void 0 ? { tools: ctx.tools } : {},
 				...ctx?.toolChoice !== void 0 ? { toolChoice: ctx.toolChoice } : {},
 				...ctx?.responseFormat !== void 0 ? { responseFormat: ctx.responseFormat } : {}
 			},
@@ -5091,7 +5101,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 				if (processedSpan) {
 					emitAutoExtractedMetrics(processedSpan, this.getMetricsContext(processedSpan));
 					const processedAttrs = processedSpan.attributes;
-					if (excludedModelUsage && !processedAttrs?.usage) emitTokenMetricsForUsage(excludedModelUsage.usage, excludedModelUsage.provider, excludedModelUsage.model, this.getMetricsContext(processedSpan));
+					if (excludedModelUsage && !processedAttrs?.usage) emitTokenMetricsForUsage(excludedModelUsage.usage, excludedModelUsage.provider, excludedModelUsage.model, excludedModelUsage.usageIncomplete, this.getMetricsContext(processedSpan));
 				}
 			} catch (err) {
 				this.logger.error("[Observability] Auto-extraction error:", err);
@@ -5154,7 +5164,8 @@ var BaseObservabilityInstance = class extends MastraBase {
 			ancestor,
 			usage,
 			provider: endAttrs?.provider ?? liveAttrs?.provider,
-			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model)
+			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model),
+			usageIncomplete: endAttrs?.usageIncomplete ?? liveAttrs?.usageIncomplete
 		};
 	}
 	/**
@@ -5176,7 +5187,8 @@ var BaseObservabilityInstance = class extends MastraBase {
 		return {
 			usage,
 			provider: endAttrs?.provider ?? liveAttrs?.provider ?? stashed?.provider,
-			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model, stashed?.model)
+			model: resolveModelId(endAttrs?.responseModel, endAttrs?.model, liveAttrs?.responseModel, liveAttrs?.model, stashed?.model),
+			usageIncomplete: endAttrs?.usageIncomplete ?? liveAttrs?.usageIncomplete
 		};
 	}
 	/**
@@ -5186,11 +5198,11 @@ var BaseObservabilityInstance = class extends MastraBase {
 	* span instead of the hidden agent that incurred them.
 	*/
 	applyUsageRollup(target) {
-		const { ancestor, usage, provider, model } = target;
+		const { ancestor, usage, provider, model, usageIncomplete } = target;
 		const attrs = ancestor.attributes;
 		attrs.internalUsage = addUsageStats(attrs.internalUsage, usage);
 		try {
-			emitTokenMetricsForUsage(usage, provider, model, this.getMetricsContext(ancestor));
+			emitTokenMetricsForUsage(usage, provider, model, usageIncomplete, this.getMetricsContext(ancestor));
 		} catch (err) {
 			this.logger.error("[Observability] Usage rollup metric emission error:", err);
 		}
@@ -6244,6 +6256,15 @@ var TrackingExporter = class extends BaseExporter {
 					});
 					return true;
 				case "handleSpanEnd":
+					if (!traceData.hasSpan({ spanId: exportedSpan.id })) {
+						traceData.addToWaitingQueue({
+							event,
+							waitingFor: exportedSpan.id,
+							attempts: queuedEvent.attempts,
+							queuedAt: queuedEvent.queuedAt
+						});
+						return true;
+					}
 					traceData.endSpan({ spanId: exportedSpan.id });
 					await this._finishSpan({
 						span: exportedSpan,
@@ -6565,6 +6586,17 @@ var TrackingExporter = class extends BaseExporter {
 						traceId: exportedSpan.traceId,
 						spanId: exportedSpan.id
 					});
+					if (!traceData.hasSpan({ spanId: exportedSpan.id })) {
+						this.logger.debug(`${this.name}: adding span end to waiting queue`, {
+							traceId: exportedSpan.traceId,
+							waitingFor: exportedSpan.id
+						});
+						traceData.addToWaitingQueue({
+							event,
+							waitingFor: exportedSpan.id
+						});
+						break;
+					}
 					traceData.endSpan({ spanId: exportedSpan.id });
 					await this._finishSpan({
 						span: exportedSpan,