@mastra/observability 1.21.0 → 1.21.1-alpha.0

package/dist/index.js

@@ -2638,7 +2638,7 @@ var ModelSpanTracker = class {
 	* Returns undefined if no step span is active.
 	*/
 	exportCurrentStep() {
-		return this.#currentStepSpan?.exportSpan();
+		return this.#currentStepSpan?.snapshot();
 	}
 	/**
 	* Get the pending step finish payload (captured when defer mode is enabled).
@@ -3550,6 +3550,13 @@ var BaseSpan = class BaseSpan {
 			...this.isRootSpan && !nestedUnderParent && this.tags?.length ? { tags: this.tags } : {}
 		};
 	}
+	/** Returns the span saved for a later `rebuildSpan()`, with its trace state */
+	snapshot() {
+		return {
+			...this.exportSpan(),
+			...this.traceState ? { traceState: this.traceState } : {}
+		};
+	}
 	get externalTraceId() {
 		return this.isValid ? this.traceId : void 0;
 	}
@@ -5156,7 +5163,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 	* - Can have end(), update(), error() called on it
 	* - Will emit SPAN_ENDED or SPAN_UPDATED when those methods are called
 	*
-	* @param cached - The exported span data to rebuild from
+	* @param cached - The span snapshot to rebuild from
 	* @returns A span that can have lifecycle methods called on it
 	*/
 	rebuildSpan(cached) {
@@ -5176,15 +5183,26 @@ var BaseObservabilityInstance = class extends MastraBase {
 			entityId: cached.entityId,
 			entityName: cached.entityName,
 			tracingPolicy: cached.isInternal ? { internal: InternalSpans.ALL } : void 0,
-			traceState: cached.nestedUnderParent ? {
-				requestContextKeys: [],
-				nestedUnderParent: true
-			} : void 0
+			traceState: this.rebuildTraceState(cached)
 		});
 		this.wireSpanLifecycle(span);
 		return span;
 	}
 	/**
+	* Restore the trace-level rules for a rebuilt span. Spans saved with
+	* `exportSpan()` before `snapshot()` existed fall back to the instance's
+	* configured keys, so an in-flight durable run keeps at least those across an upgrade.
+	*/
+	rebuildTraceState(cached) {
+		if (cached.traceState) return cached.traceState;
+		const fallback = this.computeTraceState();
+		if (!cached.nestedUnderParent) return fallback;
+		return {
+			requestContextKeys: fallback?.requestContextKeys ?? [],
+			nestedUnderParent: true
+		};
+	}
+	/**
 	* Get current configuration
 	*/
 	getConfig() {