@mastra/observability 1.17.0 → 1.17.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @mastra/observability
 
+## 1.17.1-alpha.0
+
+### Patch Changes
+
+- Fixed span serialization so internal tracing fields are removed only from framework-owned payloads while preserving user data with the same key names. ([#21332](https://github.com/mastra-ai/mastra/pull/21332))
+
+- Advertise quota-pause support to the Mastra platform. `MastraPlatformExporter` now sends `x-mastra-observability-capabilities: quota-pause-v1` on every request (batch uploads for all five signal types, plus the traces recovery probe), letting the platform respond with `402 Payment Required` to clients that understand the quota-pause contract while shielding legacy clients from retry loops. No configuration change is required: ([#21447](https://github.com/mastra-ai/mastra/pull/21447))
+
+  ```ts
+  import { MastraPlatformExporter } from '@mastra/observability';
+
+  const exporter = new MastraPlatformExporter({
+    accessToken: process.env.MASTRA_PLATFORM_ACCESS_TOKEN,
+  });
+  ```
+
+- Updated dependencies [[`15101bb`](https://github.com/mastra-ai/mastra/commit/15101bb53c0d934f31af6b8813b88191e382a5e5), [`c2c3deb`](https://github.com/mastra-ai/mastra/commit/c2c3debcf670c7082d0a5e553aa99818a864698c), [`33374ba`](https://github.com/mastra-ai/mastra/commit/33374ba359e4fb13eaa918ae925fe167a3c55414), [`c5f964d`](https://github.com/mastra-ai/mastra/commit/c5f964d3f77064e978f8066ec506eed77ba5c63c), [`f8f653f`](https://github.com/mastra-ai/mastra/commit/f8f653f10980d01a73706cc3c8689ca5e40ce808)]:
+  - @mastra/core@1.60.0-alpha.1
+
 ## 1.17.0
 
 ### Minor Changes

package/dist/exporters/mastra-platform.d.ts

@@ -14,6 +14,8 @@ export interface MastraPlatformExporterConfig extends BaseExporterConfig {
     scoresEndpoint?: string;
     feedbackEndpoint?: string;
 }
+export declare const OBSERVABILITY_CAPABILITIES_HEADER = "x-mastra-observability-capabilities";
+export declare const QUOTA_PAUSE_CAPABILITY = "quota-pause-v1";
 export declare class MastraPlatformExporter extends BaseExporter {
     name: string;
     private readonly platformConfig;

package/dist/exporters/mastra-platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mastra-platform.d.ts","sourceRoot":"","sources":["../../src/exporters/mastra-platform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EAEZ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAEjD,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAkOD,qBAAa,sBAAuB,SAAQ,YAAY;IACtD,IAAI,SAA8B;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAA+B;IACtD,OAAO,CAAC,yBAAyB,CAAwC;IACzE,OAAO,CAAC,YAAY,CAAS;gBAEjB,MAAM,GAAE,4BAAiC;cAyErC,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjE,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1C,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAahD,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9C,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,cAAc;YAMR,mBAAmB;IAYjC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,aAAa;YAoBP,WAAW;IA4EzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,gBAAgB;YAIV,WAAW;IAoDzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,kBAAkB;IAkB1B;;;;;OAKG;YACW,gBAAgB;YAoDhB,gBAAgB;IAmC9B,OAAO,CAAC,WAAW;IAUnB;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAsChC"}
+{"version":3,"file":"mastra-platform.d.ts","sourceRoot":"","sources":["../../src/exporters/mastra-platform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EAEZ,QAAQ,EACR,WAAW,EACX,UAAU,EACV,aAAa,EACd,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAEjD,MAAM,WAAW,4BAA6B,SAAQ,kBAAkB;IACtE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAyBD,eAAO,MAAM,iCAAiC,wCAAwC,CAAC;AACvF,eAAO,MAAM,sBAAsB,mBAAmB,CAAC;AA6MvD,qBAAa,sBAAuB,SAAQ,YAAY;IACtD,IAAI,SAA8B;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAA+B;IACtD,OAAO,CAAC,yBAAyB,CAAwC;IACzE,OAAO,CAAC,YAAY,CAAS;gBAEjB,MAAM,GAAE,4BAAiC;cAyErC,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjE,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1C,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAahD,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAa9C,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,cAAc;YAMR,mBAAmB;IAYjC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,aAAa;YAoBP,WAAW;IA4EzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,gBAAgB;YAIV,WAAW;IAoDzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,kBAAkB;IAkB1B;;;;;OAKG;YACW,gBAAgB;YAoDhB,gBAAgB;IAmC9B,OAAO,CAAC,WAAW;IAUnB;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAsChC"}

package/dist/index.cjs

@@ -210,21 +210,15 @@ var BaseObservabilityEventBus = class BaseObservabilityEventBus extends _mastra_
 * }
 * ```
 */
-/**
-* Default keys to strip from objects during deep cleaning.
-* These are typically internal/sensitive fields that shouldn't be traced.
-*/
-const DEFAULT_KEYS_TO_STRIP = /* @__PURE__ */ new Set([
-	"logger",
-	"experimental_providerMetadata",
-	"providerMetadata",
-	"steps",
-	"tracingContext",
-	"execute",
-	"validate"
-]);
+const FUNCTION_KEYS_TO_STRIP = /* @__PURE__ */ new Set(["execute", "validate"]);
+const LOGGER_METHODS = [
+	"debug",
+	"info",
+	"warn",
+	"error"
+];
 const DEFAULT_DEEP_CLEAN_OPTIONS = Object.freeze({
-	keysToStrip: DEFAULT_KEYS_TO_STRIP,
+	keysToStrip: [],
 	maxDepth: 8,
 	maxStringLength: 128 * 1024,
 	maxArrayLength: 50,
@@ -237,7 +231,7 @@ const DEFAULT_DEEP_CLEAN_OPTIONS = Object.freeze({
 function mergeSerializationOptions(userOptions) {
 	if (!userOptions) return DEFAULT_DEEP_CLEAN_OPTIONS;
 	return {
-		keysToStrip: DEFAULT_KEYS_TO_STRIP,
+		keysToStrip: DEFAULT_DEEP_CLEAN_OPTIONS.keysToStrip,
 		maxDepth: userOptions.maxDepth ?? DEFAULT_DEEP_CLEAN_OPTIONS.maxDepth,
 		maxStringLength: userOptions.maxStringLength ?? DEFAULT_DEEP_CLEAN_OPTIONS.maxStringLength,
 		maxArrayLength: userOptions.maxArrayLength ?? DEFAULT_DEEP_CLEAN_OPTIONS.maxArrayLength,
@@ -263,6 +257,47 @@ function getMapKeyType(key) {
 	if (key instanceof Error) return "error";
 	return typeof key;
 }
+function hasOnlyKnownKeys(value, keys) {
+	try {
+		return Object.keys(value).every((key) => keys.includes(key));
+	} catch {
+		return false;
+	}
+}
+function isSpanLike(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const span = value;
+	try {
+		return typeof span.id === "string" && typeof span.traceId === "string" && typeof span.type === "string" && typeof span.name === "string";
+	} catch {
+		return false;
+	}
+}
+function isTracingContextLike(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const context = value;
+	if (!hasOnlyKnownKeys(context, ["currentSpan"])) return false;
+	try {
+		return context.currentSpan === void 0 || isSpanLike(context.currentSpan);
+	} catch {
+		return false;
+	}
+}
+function isLoggerLike(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const logger = value;
+	try {
+		return LOGGER_METHODS.some((method) => typeof logger[method] === "function");
+	} catch {
+		return false;
+	}
+}
+function shouldStripEntry(key, value, stripSet) {
+	if (stripSet.has(key)) return true;
+	if (key === "tracingContext" && isTracingContextLike(value)) return true;
+	if (key === "logger") return typeof value === "function" || isLoggerLike(value);
+	return FUNCTION_KEYS_TO_STRIP.has(key) && typeof value === "function";
+}
 function restoreSerializedMapKey(keyType, key) {
 	switch (keyType) {
 		case "undefined": return;
@@ -365,7 +400,7 @@ function deepClean(value, options = DEFAULT_DEEP_CLEAN_OPTIONS) {
 				let mapKeyCount = 0;
 				let omittedMapEntries = 0;
 				for (const [mapKey, mapVal] of val) {
-					if (typeof mapKey === "string" && stripSet.has(mapKey)) continue;
+					if (typeof mapKey === "string" && shouldStripEntry(mapKey, mapVal, stripSet)) continue;
 					if (mapKeyCount >= maxObjectKeys) {
 						omittedMapEntries++;
 						continue;
@@ -441,15 +476,34 @@ function deepClean(value, options = DEFAULT_DEEP_CLEAN_OPTIONS) {
 			}
 			if (looksLikeJsonSchema) return val;
 			const cleaned = {};
-			const keys = Object.keys(val).filter((key) => !stripSet.has(key));
+			let keys;
+			try {
+				keys = Object.keys(val);
+			} catch (error) {
+				return formatSerializationError(error);
+			}
 			let keyCount = 0;
 			for (const key of keys) {
+				if (stripSet.has(key)) continue;
+				let rawValue;
+				try {
+					rawValue = val[key];
+				} catch (error) {
+					if (keyCount >= maxObjectKeys) {
+						cleaned["__truncated"] = `${keys.length - keyCount} more keys omitted`;
+						break;
+					}
+					cleaned[key] = formatSerializationError(error);
+					keyCount++;
+					continue;
+				}
+				if (shouldStripEntry(key, rawValue, stripSet)) continue;
 				if (keyCount >= maxObjectKeys) {
 					cleaned["__truncated"] = `${keys.length - keyCount} more keys omitted`;
 					break;
 				}
 				try {
-					cleaned[key] = helper(val[key], depth + 1);
+					cleaned[key] = helper(rawValue, depth + 1);
 					keyCount++;
 				} catch (error) {
 					cleaned[key] = formatSerializationError(error);
@@ -2462,6 +2516,49 @@ var ModelSpanTracker = class {
 	}
 };
 //#endregion
+//#region src/spans/metadata.ts
+/**
+* Shared span-metadata helpers.
+*
+* Used by both the observability instance (`instances/base.ts`) and the span
+* base class (`spans/base.ts`) so the plain-record check and the
+* descriptor-preserving merge stay in a single place. Both feed the same span
+* metadata pipeline, so keeping one implementation avoids divergence.
+*/
+/**
+* Returns true only for plain object records (prototype is `Object.prototype`
+* or `null`). Maps, Dates, class instances, and arrays return false so callers
+* can preserve their original shape instead of shallow-copying them into `{}`.
+*/
+function isPlainRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+	try {
+		const prototype = Object.getPrototypeOf(value);
+		return prototype === Object.prototype || prototype === null;
+	} catch {
+		return false;
+	}
+}
+/**
+* Merges two metadata values while preserving property descriptors (so getters
+* are copied as accessors rather than eagerly invoked). Only plain records are
+* merged; if either side is non-plain the second argument is returned as-is,
+* matching the previous per-module behavior.
+*/
+function mergeMetadata$1(parentMetadata, metadata) {
+	if (!parentMetadata) return metadata;
+	if (!metadata) return parentMetadata;
+	if (!isPlainRecord(parentMetadata) || !isPlainRecord(metadata)) return metadata;
+	try {
+		const merged = {};
+		Object.defineProperties(merged, Object.getOwnPropertyDescriptors(parentMetadata));
+		Object.defineProperties(merged, Object.getOwnPropertyDescriptors(metadata));
+		return merged;
+	} catch {
+		return metadata;
+	}
+}
+//#endregion
 //#region src/spans/base.ts
 /**
 * Determines if a span type should be considered internal based on flags.
@@ -2586,10 +2683,7 @@ var BaseSpan = class {
 		this.type = options.type;
 		this.isInternal = isSpanInternal(this.type, options.tracingPolicy?.internal);
 		this.isExcluded = this.alwaysExcluded || observabilityConfig.excludeSpanTypes?.includes(this.type) === true || this.isInternal && !observabilityConfig.includeInternalSpans;
-		this.metadata = deepClean(options.parent?.metadata || options.metadata ? {
-			...options.parent?.metadata,
-			...options.metadata
-		} : void 0, this.deepCleanOptions);
+		this.metadata = deepClean(this.prepareSpanMetadata(mergeMetadata$1(options.parent?.metadata, options.metadata)), this.deepCleanOptions);
 		this.parent = options.parent;
 		this.startTime = options.startTime ?? /* @__PURE__ */ new Date();
 		this.observabilityInstance = observabilityInstance;
@@ -2607,9 +2701,32 @@ var BaseSpan = class {
 		}
 		this.attributes = deepClean(options.attributes, this.deepCleanOptions) || {};
 		if (options.requestContext && options.requestContext.size() > 0) this.requestContext = deepClean(options.requestContext, this.deepCleanOptions);
-		if (this.isEvent) this.output = deepClean(options.output, this.deepCleanOptions);
+		if (this.isEvent) this.output = deepClean(this.prepareSpanOutput(options.output), this.deepCleanOptions);
 		else this.input = deepClean(options.input, this.deepCleanOptions);
 	}
+	prepareSpanOutput(value) {
+		if (!isPlainRecord(value)) return value;
+		if (this.type !== _mastra_core_observability.SpanType.MODEL_STEP && this.type !== _mastra_core_observability.SpanType.MODEL_INFERENCE) return value;
+		try {
+			const prepared = { ...value };
+			delete prepared.steps;
+			return prepared;
+		} catch {
+			return value;
+		}
+	}
+	prepareSpanMetadata(value) {
+		if (!isPlainRecord(value)) return value;
+		if (this.type !== _mastra_core_observability.SpanType.MODEL_STEP) return value;
+		try {
+			const prepared = { ...value };
+			delete prepared.providerMetadata;
+			delete prepared.experimental_providerMetadata;
+			return prepared;
+		} catch {
+			return value;
+		}
+	}
 	createChildSpan(options) {
 		return this.observabilityInstance.startSpan({
 			...options,
@@ -2816,10 +2933,10 @@ var DefaultSpan = class extends BaseSpan {
 		this.endTime = /* @__PURE__ */ new Date();
 		if (options?.metadata) this.metadata = {
 			...this.metadata,
-			...deepClean(options.metadata, this.deepCleanOptions)
+			...deepClean(this.prepareSpanMetadata(options.metadata), this.deepCleanOptions)
 		};
 		if (this.isExcluded) return;
-		if (options?.output !== void 0) this.output = deepClean(options.output, this.deepCleanOptions);
+		if (options?.output !== void 0) this.output = deepClean(this.prepareSpanOutput(options.output), this.deepCleanOptions);
 		if (options?.attributes) this.attributes = {
 			...this.attributes,
 			...deepClean(options.attributes, this.deepCleanOptions)
@@ -2830,7 +2947,7 @@ var DefaultSpan = class extends BaseSpan {
 		const { error, endSpan = true, attributes, metadata } = options;
 		if (metadata) this.metadata = {
 			...this.metadata,
-			...deepClean(metadata, this.deepCleanOptions)
+			...deepClean(this.prepareSpanMetadata(metadata), this.deepCleanOptions)
 		};
 		if (!this.isExcluded) {
 			this.errorInfo = deepClean(error instanceof _mastra_core_error.MastraError ? {
@@ -2859,11 +2976,11 @@ var DefaultSpan = class extends BaseSpan {
 		if (options.name !== void 0) this.name = options.name;
 		if (options.metadata) this.metadata = {
 			...this.metadata,
-			...deepClean(options.metadata, this.deepCleanOptions)
+			...deepClean(this.prepareSpanMetadata(options.metadata), this.deepCleanOptions)
 		};
 		if (this.isExcluded) return;
 		if (options.input !== void 0) this.input = deepClean(options.input, this.deepCleanOptions);
-		if (options.output !== void 0) this.output = deepClean(options.output, this.deepCleanOptions);
+		if (options.output !== void 0) this.output = deepClean(this.prepareSpanOutput(options.output), this.deepCleanOptions);
 		if (options.attributes) this.attributes = {
 			...this.attributes,
 			...deepClean(options.attributes, this.deepCleanOptions)
@@ -2951,6 +3068,19 @@ var NoOpSpan = class extends BaseSpan {
 /**
 * BaseObservability - Abstract base class for Observability implementations
 */
+function hasMetadataKey(metadata, key) {
+	if (!metadata || typeof metadata !== "object") return false;
+	try {
+		return Object.prototype.hasOwnProperty.call(Object.getOwnPropertyDescriptors(metadata), key);
+	} catch {
+		return true;
+	}
+}
+function injectEnvironmentMetadata(metadata, environment) {
+	if (environment === void 0 || hasMetadataKey(metadata, "environment")) return metadata;
+	if (metadata && !isPlainRecord(metadata)) return metadata;
+	return mergeMetadata$1(metadata, { environment });
+}
 /**
 * Abstract base class for all Observability implementations in Mastra.
 */
@@ -3046,16 +3176,9 @@ var BaseObservabilityInstance = class extends _mastra_core_base.MastraBase {
 		let traceState;
 		if (options.parent) traceState = options.parent.traceState;
 		else traceState = this.computeTraceState(tracingOptions);
-		const tracingMetadata = !options.parent ? tracingOptions?.metadata : void 0;
-		const mergedMetadata = metadata || tracingMetadata ? {
-			...metadata,
-			...tracingMetadata
-		} : void 0;
+		const mergedMetadata = mergeMetadata$1(metadata, !options.parent ? tracingOptions?.metadata : void 0);
 		const enrichedMetadata = this.extractMetadataFromRequestContext(requestContext, mergedMetadata, traceState);
-		const finalMetadata = !options.parent && this.#mastraEnvironment !== void 0 && (enrichedMetadata === void 0 || enrichedMetadata.environment === void 0) ? {
-			...enrichedMetadata ?? {},
-			environment: this.#mastraEnvironment
-		} : enrichedMetadata;
+		const finalMetadata = !options.parent ? injectEnvironmentMetadata(enrichedMetadata, this.#mastraEnvironment) : enrichedMetadata;
 		const tags = !options.parent ? tracingOptions?.tags : void 0;
 		const traceId = !options.parent ? options.traceId ?? tracingOptions?.traceId : options.traceId;
 		const parentSpanId = options.parentSpanId;
@@ -3320,10 +3443,7 @@ var BaseObservabilityInstance = class extends _mastra_core_base.MastraBase {
 		if (!requestContext || !traceState || traceState.requestContextKeys.length === 0) return explicitMetadata;
 		const extracted = this.extractKeys(requestContext, traceState.requestContextKeys);
 		if (Object.keys(extracted).length === 0 && !explicitMetadata) return;
-		return {
-			...extracted,
-			...explicitMetadata
-		};
+		return mergeMetadata$1(extracted, explicitMetadata);
 	}
 	/**
 	* Extract specific keys from RequestContext
@@ -6370,6 +6490,8 @@ const QUOTA_EXCEEDED_STATUS = 402;
 const OBSERVABILITY_STATUS_HEADER = "x-mastra-observability";
 const OBSERVABILITY_DISABLED_VALUE = "disabled";
 const OBSERVABILITY_RETRY_AFTER_HEADER = "x-mastra-observability-retry-after";
+const OBSERVABILITY_CAPABILITIES_HEADER = "x-mastra-observability-capabilities";
+const QUOTA_PAUSE_CAPABILITY = "quota-pause-v1";
 const DEFAULT_QUOTA_PROBE_INTERVAL_SECONDS = 300;
 const MAX_QUOTA_PROBE_INTERVAL_SECONDS = Math.floor(2147483647 / 1e3);
 function isObservabilityDisabled(response) {
@@ -6696,7 +6818,8 @@ var MastraPlatformExporter = class extends BaseExporter {
 	buildPublishHeaders() {
 		return {
 			Authorization: `Bearer ${this.platformConfig.accessToken}`,
-			"Content-Type": "application/json"
+			"Content-Type": "application/json",
+			[OBSERVABILITY_CAPABILITIES_HEADER]: QUOTA_PAUSE_CAPABILITY
 		};
 	}
 	buildPublishBody(signal, records) {
@@ -6749,7 +6872,7 @@ var MastraPlatformExporter = class extends BaseExporter {
 			this.flushTimer = null;
 		}
 		this.resetBuffer();
-		this.logger.warn(`Mastra observability paused: quota exhausted, dropping telemetry and probing every ${retryAfterSeconds}s`);
+		this.logger.warn(`Mastra observability export paused: platform quota exhausted (OBSERVABILITY_QUOTA_EXCEEDED). Dropping telemetry and retrying in ${retryAfterSeconds} seconds. Check Platform billing/usage to restore telemetry.`);
 		this.scheduleQuotaProbe();
 	}
 	scheduleQuotaProbe() {
@@ -9332,7 +9455,6 @@ exports.CardinalityFilter = CardinalityFilter;
 exports.CloudExporter = CloudExporter;
 exports.ConsoleExporter = ConsoleExporter;
 exports.DEFAULT_DEEP_CLEAN_OPTIONS = DEFAULT_DEEP_CLEAN_OPTIONS;
-exports.DEFAULT_KEYS_TO_STRIP = DEFAULT_KEYS_TO_STRIP;
 exports.DEFAULT_LIMITS = DEFAULT_LIMITS;
 exports.DefaultExporter = DefaultExporter;
 exports.DefaultObservabilityInstance = DefaultObservabilityInstance;
@@ -9344,8 +9466,10 @@ exports.MastraStorageExporter = MastraStorageExporter;
 exports.MetricsContextImpl = MetricsContextImpl;
 exports.ModelSpanTracker = ModelSpanTracker;
 exports.NoOpSpan = NoOpSpan;
+exports.OBSERVABILITY_CAPABILITIES_HEADER = OBSERVABILITY_CAPABILITIES_HEADER;
 exports.Observability = Observability;
 exports.ObservabilityBus = ObservabilityBus;
+exports.QUOTA_PAUSE_CAPABILITY = QUOTA_PAUSE_CAPABILITY;
 exports.SamplingStrategyType = SamplingStrategyType;
 exports.SensitiveDataFilter = SensitiveDataFilter;
 exports.TestExporter = TestExporter;