@mastra/server 1.67.0-alpha.3 → 1.67.0-alpha.4

package/dist/{dist-Du9y2ur5.cjs → dist-CBDJtAr5.cjs}

@@ -4694,7 +4694,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-TN3MwGgP.js
+//#region ../memory/dist/src-t3Mhge0m.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -24361,19 +24361,28 @@ const PHASE_CONFIG = {
 };
 async function withOmTracingSpan({ phase, model, inputTokens, requestContext, observabilityContext, metadata, callback }) {
 	const config = PHASE_CONFIG[phase];
+	const tracingContext = observabilityContext?.tracingContext ?? observabilityContext?.tracing;
+	const callerMetadata = tracingContext?.currentSpan?.metadata;
+	const inheritedCallerThreadId = callerMetadata?.__mastraObservationalMemoryCallerThreadId;
+	const callerThreadId = callerMetadata?.threadId;
+	const requestThreadId = requestContext?.get(_mastra_core_request_context.MASTRA_THREAD_ID_KEY);
+	const omCallerThreadId = typeof inheritedCallerThreadId === "string" && inheritedCallerThreadId ? inheritedCallerThreadId : typeof callerThreadId === "string" && callerThreadId ? callerThreadId : typeof requestThreadId === "string" && requestThreadId ? requestThreadId : void 0;
 	const span = (0, _mastra_core_observability.getOrCreateSpan)({
 		type: _mastra_core_observability.SpanType.MEMORY_OPERATION,
 		name: config.name,
 		entityType: _mastra_core_observability.EntityType.MEMORY,
 		entityName: config.entityName,
-		tracingContext: observabilityContext?.tracingContext ?? observabilityContext?.tracing,
+		tracingContext,
 		attributes: {
 			operationType: config.operationType,
 			inputTokens,
 			selectedModel: typeof model === "string" ? model : "(dynamic-model)",
 			...config.multiThread ? { multiThread: true } : {}
 		},
-		metadata,
+		metadata: omCallerThreadId !== void 0 ? {
+			...metadata,
+			__mastraObservationalMemoryCallerThreadId: omCallerThreadId
+		} : metadata,
 		requestContext
 	});
 	const childObservabilityContext = (0, _mastra_core_observability.createObservabilityContext)({ currentSpan: span });
@@ -32995,7 +33004,7 @@ ${formattedMessages}
 		if (!this.buffering.isAsyncObservationEnabled()) return false;
 		const lockKey = this.buffering.getLockKey(opts.threadId, opts.resourceId);
 		const shouldTrigger = this.buffering.shouldTriggerAsyncObservation(opts.pendingTokens, lockKey, opts.record, this.storage, opts.threshold);
-		if (shouldTrigger) this.trackBackgroundWork(this.startAsyncBufferedObservation(opts.record, opts.threadId, opts.unobservedMessages, lockKey, opts.writer, opts.unbufferedPendingTokens, opts.requestContext));
+		if (shouldTrigger) this.trackBackgroundWork(this.startAsyncBufferedObservation(opts.record, opts.threadId, opts.unobservedMessages, lockKey, opts.writer, opts.unbufferedPendingTokens, opts.requestContext, opts.observabilityContext));
 		return shouldTrigger;
 	}
 	isMessageList(value) {
@@ -47212,4 +47221,4 @@ const agentBuilderWorkflows = {
 //#endregion
 exports.agentBuilderWorkflows = agentBuilderWorkflows;
 
-//# sourceMappingURL=dist-Du9y2ur5.cjs.map
+//# sourceMappingURL=dist-CBDJtAr5.cjs.map