@mastra/observability 1.16.6 → 1.17.0-alpha.0

package/dist/index.js

@@ -2516,8 +2516,10 @@ var BaseSpan = class {
 	entityId;
 	/** Entity name that created the span */
 	entityName;
-	/** Parent span ID (for root spans that are children of external spans) */
+	/** Parent span within this Mastra trace: a span Mastra created (the span-tree parent, or a prior Mastra span such as the suspended run a resume links back to) */
 	parentSpanId;
+	/** Parent from an external tracing system (ambient OTel / dd-trace span) that Mastra did not create; carried for external correlation, not part of Mastra's own parent/child linkage */
+	externalParentSpanId;
 	/** Deep clean options for serialization */
 	deepCleanOptions;
 	/**
@@ -2624,6 +2626,17 @@ var BaseSpan = class {
 		if (parentSpan) return parentSpan.id;
 		return this.parent.getParentSpanId(includeInternalSpans);
 	}
+	/**
+	* External (foreign tracing-system) parent id to export alongside
+	* {@link getParentSpanId}. When every Mastra ancestor is dropped from
+	* export, the span is exported at the root's position, so the root's
+	* external parent must travel with it.
+	*/
+	getExportedExternalParentSpanId(includeInternalSpans) {
+		if (!this.parent) return this.externalParentSpanId;
+		if (this.getParentSpan(includeInternalSpans)) return this.externalParentSpanId;
+		return this.parent.getExportedExternalParentSpanId(includeInternalSpans);
+	}
 	/** Find the closest parent span of a specific type by walking up the parent chain */
 	findParent(spanType) {
 		let current = this.parent;
@@ -2698,6 +2711,7 @@ var BaseSpan = class {
 			isEvent: this.isEvent,
 			isRootSpan: this.isRootSpan,
 			parentSpanId: this.getParentSpanId(includeInternalSpans),
+			externalParentSpanId: this.getExportedExternalParentSpanId(includeInternalSpans),
 			...this.isRootSpan && this.tags?.length ? { tags: this.tags } : {}
 		};
 	}
@@ -2740,6 +2754,7 @@ var DefaultSpan = class extends BaseSpan {
 			this.id = options.spanId;
 			this.traceId = options.traceId;
 			if (options.parentSpanId) this.parentSpanId = options.parentSpanId;
+			if (options.externalParentSpanId) this.externalParentSpanId = options.externalParentSpanId;
 			return;
 		}
 		const bridge = observabilityInstance.getBridge();
@@ -2748,7 +2763,8 @@ var DefaultSpan = class extends BaseSpan {
 			if (bridgeIds) {
 				this.id = bridgeIds.spanId;
 				this.traceId = bridgeIds.traceId;
-				this.parentSpanId = bridgeIds.parentSpanId;
+				this.parentSpanId = options.parentSpanId ?? bridgeIds.parentSpanId;
+				this.externalParentSpanId = options.externalParentSpanId ?? bridgeIds.externalParentSpanId;
 				return;
 			}
 		}
@@ -2762,6 +2778,8 @@ var DefaultSpan = class extends BaseSpan {
 		this.id = generateSpanId();
 		if (options.parentSpanId) if (isValidSpanId(options.parentSpanId)) this.parentSpanId = options.parentSpanId;
 		else console.error(`[Mastra Tracing] Invalid parentSpanId: must be 1-16 hexadecimal characters, got "${options.parentSpanId}". Ignoring.`);
+		if (options.externalParentSpanId) if (isValidSpanId(options.externalParentSpanId)) this.externalParentSpanId = options.externalParentSpanId;
+		else console.error(`[Mastra Tracing] Invalid externalParentSpanId: must be 1-16 hexadecimal characters, got "${options.externalParentSpanId}". Ignoring.`);
 	}
 	end(options) {
 		if (this.isEvent) return;
@@ -3010,11 +3028,13 @@ var BaseObservabilityInstance = class extends MastraBase {
 		} : enrichedMetadata;
 		const tags = !options.parent ? tracingOptions?.tags : void 0;
 		const traceId = !options.parent ? options.traceId ?? tracingOptions?.traceId : options.traceId;
-		const parentSpanId = !options.parent ? options.parentSpanId ?? tracingOptions?.parentSpanId : options.parentSpanId;
+		const parentSpanId = options.parentSpanId;
+		const externalParentSpanId = !options.parent ? options.externalParentSpanId ?? tracingOptions?.parentSpanId : options.externalParentSpanId;
 		const span = this.createSpan({
 			...rest,
 			traceId,
 			parentSpanId,
+			externalParentSpanId,
 			metadata: finalMetadata,
 			traceState,
 			tags,