@mastra/observability 1.16.0 → 1.16.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @mastra/observability
 
+## 1.16.1-alpha.1
+
+### Patch Changes
+
+- Fixed cost estimation for Amazon Bedrock inference profiles, including geographic prefixes and versioned model IDs. ([#19360](https://github.com/mastra-ai/mastra/pull/19360))
+
+- Added PROVIDER_TOOL_CALL to exporter span-type mappings and duration metrics so provider-executed tool spans are classified as tool spans across all observability platforms. ([#19261](https://github.com/mastra-ai/mastra/pull/19261))
+
+- Updated dependencies [[`25e7c12`](https://github.com/mastra-ai/mastra/commit/25e7c126a770069ae7fb7ecf1d2adb40e017b009), [`1ce5121`](https://github.com/mastra-ai/mastra/commit/1ce512155d122bb21f47d98383e82ffbf84b39e8), [`3cfc47a`](https://github.com/mastra-ai/mastra/commit/3cfc47a6b89940aadd0f46fb01ae9624a73a865d), [`2bb7817`](https://github.com/mastra-ai/mastra/commit/2bb78176112fde628483de2830528f7eee911e56), [`51d9870`](https://github.com/mastra-ai/mastra/commit/51d987032c689c2855374d0f244f5d654da809d1), [`5cab274`](https://github.com/mastra-ai/mastra/commit/5cab2744250e22d12fefa7b32637dce224233cee), [`7fa27d3`](https://github.com/mastra-ai/mastra/commit/7fa27d3b6f5ed68cd34e454a4d3ad9c482a0cfbc), [`a58dcbb`](https://github.com/mastra-ai/mastra/commit/a58dcbb546d7e1d65ebdc1f39e55f0908fcd9391), [`153bd3b`](https://github.com/mastra-ai/mastra/commit/153bd3b396bdfed6b74cf43de12db8fd2d83c04a), [`07bb863`](https://github.com/mastra-ai/mastra/commit/07bb8631919c6f7cf377dccd45b096e0f17fbed0), [`8a586ec`](https://github.com/mastra-ai/mastra/commit/8a586eca9a4914f31dff6140d0d45ac375b00669), [`3927473`](https://github.com/mastra-ai/mastra/commit/392747323ddb10c643d12be7b9ae913159dfaeed), [`dce50dc`](https://github.com/mastra-ai/mastra/commit/dce50dc9a1c1fcd0f427bb5f6250ec74910cb04b), [`634caff`](https://github.com/mastra-ai/mastra/commit/634caff29a9200ad058b67d53f96d9e5832fb8a2)]:
+  - @mastra/core@1.51.0-alpha.7
+
+## 1.16.1-alpha.0
+
+### Patch Changes
+
+- Fixed storage exporters to report persistence failures immediately and retry failed batches automatically with the configured exponential backoff. ([#19259](https://github.com/mastra-ai/mastra/pull/19259))
+
+- Updated dependencies [[`fb8aea3`](https://github.com/mastra-ai/mastra/commit/fb8aea384291e77311be3a64ee1717320d5c3c73), [`4ce0163`](https://github.com/mastra-ai/mastra/commit/4ce0163dc86e675a86809685c8ce6c49f1aeb87e)]:
+  - @mastra/core@1.51.0-alpha.5
+
 ## 1.16.0
 
 ### Minor Changes

package/dist/exporters/default.d.ts

@@ -42,6 +42,9 @@ export declare class DefaultExporter extends BaseExporter {
      * Schedules a flush using setTimeout
      */
     private scheduleFlush;
+    private retryDelay;
+    private retryAttempt;
+    private logStorageFailure;
     /**
      * Checks flush triggers and schedules/triggers flush as needed.
      * Called after adding any event to the buffer.

package/dist/exporters/default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../src/exporters/default.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACR,UAAU,EACV,aAAa,EAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAwB,sBAAsB,EAAwB,MAAM,sBAAsB,CAAC;AAS/G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC;;;;;;GAMG;AACH,UAAU,qBAAsB,SAAQ,kBAAkB;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,QAAQ,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;CAC5C;AA6BD;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAC/C,IAAI,SAA2C;gBAgBnC,MAAM,GAAE,qBAA0B;IAiB9C;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvD;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAarB;;;;OAIG;YACW,kBAAkB;IAQhC,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,QAAQ;IAsBhB;;;;OAIG;YACW,YAAY;IA6B1B;;;OAGG;YACW,gBAAgB;IA0D9B;;;;;;;OAOG;YACW,WAAW;IAmHnB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;;;OAIG;YACW,WAAW;IAOzB;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;OAEG;IACG,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAYhC"}
+{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../src/exporters/default.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACR,UAAU,EACV,aAAa,EAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAwB,sBAAsB,EAAwB,MAAM,sBAAsB,CAAC;AAS/G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC;;;;;;GAMG;AACH,UAAU,qBAAsB,SAAQ,kBAAkB;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,QAAQ,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;CAC5C;AAoCD;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,YAAY;;IAC/C,IAAI,SAA2C;gBAgBnC,MAAM,GAAE,qBAA0B;IAiB9C;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvD;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,iBAAiB;IAiBzB;;;;OAIG;YACW,kBAAkB;IAQhC,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,QAAQ;IAsBhB;;;;OAIG;YACW,YAAY;IAkC1B;;;OAGG;YACW,gBAAgB;IA+D9B;;;;;;;OAOG;YACW,WAAW;IA+HnB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;;;OAIG;YACW,WAAW;IAOzB;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;OAEG;IACG,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBhC"}

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

@@ -31,6 +31,9 @@ export declare class MastraStorageExporter extends BaseExporter {
      * Schedules a flush using setTimeout
      */
     private scheduleFlush;
+    private retryDelay;
+    private retryAttempt;
+    private logStorageFailure;
     /**
      * Checks flush triggers and schedules/triggers flush as needed.
      * Called after adding any event to the buffer.

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

@@ -1 +1 @@
-{"version":3,"file":"mastra-storage.d.ts","sourceRoot":"","sources":["../../src/exporters/mastra-storage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACR,UAAU,EACV,aAAa,EAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAwB,sBAAsB,EAAwB,MAAM,sBAAsB,CAAC;AAS/G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,4FAA4F;AAC5F,MAAM,WAAW,2BAA4B,SAAQ,kBAAkB;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,QAAQ,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;CAC5C;AA6BD;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;;IACrD,IAAI,SAA6B;gBAgBrB,MAAM,GAAE,2BAAgC;IAiBpD;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvD;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAarB;;;;OAIG;YACW,kBAAkB;IAQhC,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,QAAQ;IAsBhB;;;;OAIG;YACW,YAAY;IA6B1B;;;OAGG;YACW,gBAAgB;IA0D9B;;;;;;;OAOG;YACW,WAAW;IAmHnB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;;;OAIG;YACW,WAAW;IAOzB;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;OAEG;IACG,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAYhC"}
+{"version":3,"file":"mastra-storage.d.ts","sourceRoot":"","sources":["../../src/exporters/mastra-storage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACR,UAAU,EACV,aAAa,EAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAwB,sBAAsB,EAAwB,MAAM,sBAAsB,CAAC;AAS/G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,4FAA4F;AAC5F,MAAM,WAAW,2BAA4B,SAAQ,kBAAkB;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,QAAQ,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;CAC5C;AAoCD;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;;IACrD,IAAI,SAA6B;gBAgBrB,MAAM,GAAE,2BAAgC;IAiBpD;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvD;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,iBAAiB;IAiBzB;;;;OAIG;YACW,kBAAkB;IAQhC,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,QAAQ;IAsBhB;;;;OAIG;YACW,YAAY;IAkC1B;;;OAGG;YACW,gBAAgB;IA+D9B;;;;;;;OAOG;YACW,WAAW;IA+HnB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D;;;;OAIG;YACW,WAAW;IAOzB;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtD;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;OAEG;IACG,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBhC"}

package/dist/index.cjs

@@ -1006,6 +1006,7 @@ var PricingModel = class {
 
 // src/metrics/pricing-registry.ts
 var DATA_FILE_NAME = "pricing-data.jsonl";
+var BEDROCK_GEOGRAPHY_PREFIXES = /* @__PURE__ */ new Set(["global", "us", "eu", "apac", "jp", "au"]);
 var MINIFIED_METER_TO_CANONICAL = {
   it: "input_tokens",
   ot: "output_tokens",
@@ -1040,7 +1041,7 @@ var PricingRegistry = class _PricingRegistry {
     return _PricingRegistry.globalRegistry;
   }
   get(args) {
-    const variants = getModelVariants(args.model);
+    const variants = getModelVariants(args.model, normalizeProvider(args.provider));
     for (const variant of variants) {
       const key = makePricingKey({ provider: args.provider, model: variant });
       const match = this.pricingModels.get(key);
@@ -1134,7 +1135,7 @@ function normalizeProvider(provider) {
   const dotIndex = normalized.indexOf(".");
   return dotIndex !== -1 ? normalized.substring(0, dotIndex) : normalized;
 }
-function getModelVariants(model) {
+function getModelVariants(model, provider) {
   const variants = /* @__PURE__ */ new Set();
   const add = (v) => {
     variants.add(v);
@@ -1149,6 +1150,22 @@ function getModelVariants(model) {
     add(withoutVendor);
     add(withoutVendor.replace(/\./g, "-"));
   }
+  if (provider === "amazon-bedrock") {
+    const addBedrockVariant = (v) => {
+      add(v);
+      add(v.replace(/-(?:v)?\d+(?::\d+)?$/, ""));
+    };
+    const segments = model.split(".");
+    const withoutGeography = BEDROCK_GEOGRAPHY_PREFIXES.has(segments[0] ?? "") ? segments.slice(1).join(".") : model;
+    addBedrockVariant(withoutGeography);
+    addBedrockVariant(withoutGeography.replace(/\./g, "-"));
+    const vendorSeparator = withoutGeography.indexOf(".");
+    if (vendorSeparator !== -1) {
+      const withoutVendor = withoutGeography.substring(vendorSeparator + 1);
+      addBedrockVariant(withoutVendor);
+      addBedrockVariant(withoutVendor.replace(/\./g, "-"));
+    }
+  }
   return [...variants];
 }
 function stripDateSuffix(model) {
@@ -1513,6 +1530,7 @@ function getDurationMetricName(span) {
       return "mastra_agent_duration_ms";
     case observability.SpanType.TOOL_CALL:
     case observability.SpanType.MCP_TOOL_CALL:
+    case observability.SpanType.PROVIDER_TOOL_CALL:
       return "mastra_tool_duration_ms";
     case observability.SpanType.CLIENT_TOOL_CALL:
       return null;
@@ -2472,6 +2490,7 @@ function isSpanInternal(spanType, flags) {
     // Tool-related spans
     case observability.SpanType.TOOL_CALL:
     case observability.SpanType.MCP_TOOL_CALL:
+    case observability.SpanType.PROVIDER_TOOL_CALL:
       return (flags & observability.InternalSpans.TOOL) !== 0;
     // Model-related spans
     case observability.SpanType.MODEL_GENERATION:
@@ -5954,6 +5973,7 @@ function resolveTracingStorageStrategy(config, observabilityStorage, storageName
   }
   return observabilityStrategy.preferred;
 }
+var FLUSH_SUCCEEDED = { failed: false };
 var DefaultExporter = class extends BaseExporter {
   name = "mastra-default-observability-exporter";
   #config;
@@ -6048,17 +6068,37 @@ var DefaultExporter = class extends BaseExporter {
   /**
    * Schedules a flush using setTimeout
    */
-  scheduleFlush() {
+  scheduleFlush(delayMs = this.#config.maxBatchWaitMs) {
     if (this.#flushTimer) {
       clearTimeout(this.#flushTimer);
     }
     this.#flushTimer = setTimeout(() => {
+      this.#flushTimer = void 0;
       this.flushBuffer().catch((error) => {
         this.logger.error("Scheduled flush failed", {
           error: error instanceof Error ? error.message : String(error)
         });
       });
-    }, this.#config.maxBatchWaitMs);
+    }, delayMs);
+  }
+  retryDelay(retryAttempt) {
+    return this.#config.retryDelayMs * 2 ** (retryAttempt - 1);
+  }
+  retryAttempt(events) {
+    return events.reduce((earliestAttempt, event) => {
+      if (event.retryCount > this.#config.maxRetries) return earliestAttempt;
+      return earliestAttempt === void 0 ? event.retryCount : Math.min(earliestAttempt, event.retryCount);
+    }, void 0);
+  }
+  logStorageFailure(signal, events, retryAttempt, error) {
+    this.logger.warn("Failed to persist observability events", {
+      signal,
+      eventCount: events.length,
+      retryAttempt: retryAttempt ?? events.reduce((latestAttempt, event) => Math.max(latestAttempt, event.retryCount), 0),
+      maxRetries: this.#config.maxRetries,
+      ...retryAttempt === void 0 ? {} : { nextRetryDelayMs: this.retryDelay(retryAttempt) },
+      error: error instanceof Error ? error.message : String(error)
+    });
   }
   /**
    * Checks flush triggers and schedules/triggers flush as needed.
@@ -6105,22 +6145,26 @@ var DefaultExporter = class extends BaseExporter {
    * On other errors, re-adds events to the buffer for retry.
    */
   async flushCreates(signal, events, storageCall) {
-    if (events.length === 0) return;
+    if (events.length === 0) return FLUSH_SUCCEEDED;
     if (this.#unsupportedSignals.has(signal)) {
       this.emitDrop(signal, "unsupported-storage", events.length);
-      return;
+      return { failed: true };
     }
     try {
       await storageCall(events);
+      return FLUSH_SUCCEEDED;
     } catch (error$1) {
       if (error$1 instanceof error.MastraError && error$1.domain === error.ErrorDomain.MASTRA_OBSERVABILITY && error$1.id.endsWith("_NOT_IMPLEMENTED")) {
         this.logger.warn(error$1.message);
         this.#unsupportedSignals.add(signal);
         this.emitDrop(signal, "unsupported-storage", events.length, error$1);
-      } else {
-        const dropped = this.#eventBuffer.reAddCreates(events);
-        this.emitDrop(signal, "retry-exhausted", dropped.length, error$1);
+        return { failed: true };
       }
+      const dropped = this.#eventBuffer.reAddCreates(events);
+      const retryAttempt = this.retryAttempt(events);
+      this.logStorageFailure(signal, events, retryAttempt, error$1);
+      this.emitDrop(signal, "retry-exhausted", dropped.length, error$1);
+      return { failed: true, retryAttempt };
     }
   }
   /**
@@ -6129,10 +6173,10 @@ var DefaultExporter = class extends BaseExporter {
    */
   async flushSpanUpdates(events, deferredUpdates, isEnd) {
     const deferredCountAtEntry = deferredUpdates.length;
-    if (events.length === 0) return;
+    if (events.length === 0) return FLUSH_SUCCEEDED;
     if (this.#unsupportedSignals.has("tracing")) {
       this.emitDrop("tracing", "unsupported-storage", events.length);
-      return;
+      return { failed: true };
     }
     const partials = [];
     for (const event of events) {
@@ -6147,26 +6191,30 @@ var DefaultExporter = class extends BaseExporter {
         deferredUpdates.push(event);
       }
     }
-    if (partials.length === 0) return;
+    if (partials.length === 0) return FLUSH_SUCCEEDED;
     try {
       await this.#observabilityStorage.batchUpdateSpans({ records: partials });
       if (isEnd) {
         this.#eventBuffer.endFinishedSpans({ records: partials });
       }
+      return FLUSH_SUCCEEDED;
     } catch (error$1) {
       if (error$1 instanceof error.MastraError && error$1.domain === error.ErrorDomain.MASTRA_OBSERVABILITY && error$1.id.endsWith("_NOT_IMPLEMENTED")) {
         this.logger.warn(error$1.message);
         this.#unsupportedSignals.add("tracing");
         deferredUpdates.length = 0;
         this.emitDrop("tracing", "unsupported-storage", events.length + deferredCountAtEntry, error$1);
-      } else {
-        const newlyDeferred = deferredUpdates.length - deferredCountAtEntry;
-        if (newlyDeferred > 0) {
-          deferredUpdates.splice(deferredUpdates.length - newlyDeferred, newlyDeferred);
-        }
-        const dropped = this.#eventBuffer.reAddUpdates(events);
-        this.emitDrop("tracing", "retry-exhausted", dropped.length, error$1);
+        return { failed: true };
+      }
+      const newlyDeferred = deferredUpdates.length - deferredCountAtEntry;
+      if (newlyDeferred > 0) {
+        deferredUpdates.splice(deferredUpdates.length - newlyDeferred, newlyDeferred);
       }
+      const dropped = this.#eventBuffer.reAddUpdates(events);
+      const retryAttempt = this.retryAttempt(events);
+      this.logStorageFailure("tracing", events, retryAttempt, error$1);
+      this.emitDrop("tracing", "retry-exhausted", dropped.length, error$1);
+      return { failed: true, retryAttempt };
     }
   }
   /**
@@ -6234,7 +6282,7 @@ var DefaultExporter = class extends BaseExporter {
           break;
       }
     }
-    await Promise.all([
+    const flushResults = await Promise.all([
       this.flushCreates(
         "feedback",
         createFeedbackEvents,
@@ -6262,25 +6310,36 @@ var DefaultExporter = class extends BaseExporter {
       })
     ]);
     const deferredUpdates = [];
-    await this.flushSpanUpdates(updateSpanEvents, deferredUpdates, false);
-    await this.flushSpanUpdates(endSpanEvents, deferredUpdates, true);
+    flushResults.push(await this.flushSpanUpdates(updateSpanEvents, deferredUpdates, false));
+    flushResults.push(await this.flushSpanUpdates(endSpanEvents, deferredUpdates, true));
+    let deferredDropCount = 0;
     if (deferredUpdates.length > 0) {
       if (this.#unsupportedSignals.has("tracing")) {
-        this.emitDrop("tracing", "unsupported-storage", deferredUpdates.length);
+        deferredDropCount = deferredUpdates.length;
+        this.emitDrop("tracing", "unsupported-storage", deferredDropCount);
         deferredUpdates.length = 0;
       } else {
         const dropped = this.#eventBuffer.reAddUpdates(deferredUpdates);
-        this.emitDrop("tracing", "retry-exhausted", dropped.length);
+        deferredDropCount = dropped.length;
+        this.emitDrop("tracing", "retry-exhausted", deferredDropCount);
       }
     }
-    const elapsed = Date.now() - startTime;
-    this.logger.debug("Batch flushed", {
-      strategy: this.#resolvedStrategy,
-      batchSize,
-      durationMs: elapsed,
-      deferredUpdates: deferredUpdates.length > 0 ? deferredUpdates.length : void 0
-    });
-    return;
+    const retryAttempt = flushResults.reduce((earliestAttempt, result) => {
+      if (result.retryAttempt === void 0) return earliestAttempt;
+      return earliestAttempt === void 0 ? result.retryAttempt : Math.min(earliestAttempt, result.retryAttempt);
+    }, void 0);
+    if (retryAttempt !== void 0) {
+      this.scheduleFlush(this.retryDelay(retryAttempt));
+    }
+    if (!flushResults.some((result) => result.failed) && deferredDropCount === 0) {
+      const elapsed = Date.now() - startTime;
+      this.logger.debug("Batch flushed", {
+        strategy: this.#resolvedStrategy,
+        batchSize,
+        durationMs: elapsed,
+        deferredUpdates: deferredUpdates.length > 0 ? deferredUpdates.length : void 0
+      });
+    }
   }
   async _exportTracingEvent(event) {
     await this.waitForInit();
@@ -6357,6 +6416,10 @@ var DefaultExporter = class extends BaseExporter {
       this.#flushTimer = void 0;
     }
     await this.flush();
+    if (this.#flushTimer) {
+      clearTimeout(this.#flushTimer);
+      this.#flushTimer = void 0;
+    }
     this.logger.info("DefaultExporter shutdown complete");
   }
 };
@@ -6889,6 +6952,7 @@ function resolveTracingStorageStrategy2(config, observabilityStorage, storageNam
   }
   return observabilityStrategy.preferred;
 }
+var FLUSH_SUCCEEDED2 = { failed: false };
 var MastraStorageExporter = class extends BaseExporter {
   name = "mastra-storage-exporter";
   #config;
@@ -6983,17 +7047,37 @@ var MastraStorageExporter = class extends BaseExporter {
   /**
    * Schedules a flush using setTimeout
    */
-  scheduleFlush() {
+  scheduleFlush(delayMs = this.#config.maxBatchWaitMs) {
     if (this.#flushTimer) {
       clearTimeout(this.#flushTimer);
     }
     this.#flushTimer = setTimeout(() => {
+      this.#flushTimer = void 0;
       this.flushBuffer().catch((error) => {
         this.logger.error("Scheduled flush failed", {
           error: error instanceof Error ? error.message : String(error)
         });
       });
-    }, this.#config.maxBatchWaitMs);
+    }, delayMs);
+  }
+  retryDelay(retryAttempt) {
+    return this.#config.retryDelayMs * 2 ** (retryAttempt - 1);
+  }
+  retryAttempt(events) {
+    return events.reduce((earliestAttempt, event) => {
+      if (event.retryCount > this.#config.maxRetries) return earliestAttempt;
+      return earliestAttempt === void 0 ? event.retryCount : Math.min(earliestAttempt, event.retryCount);
+    }, void 0);
+  }
+  logStorageFailure(signal, events, retryAttempt, error) {
+    this.logger.warn("Failed to persist observability events", {
+      signal,
+      eventCount: events.length,
+      retryAttempt: retryAttempt ?? events.reduce((latestAttempt, event) => Math.max(latestAttempt, event.retryCount), 0),
+      maxRetries: this.#config.maxRetries,
+      ...retryAttempt === void 0 ? {} : { nextRetryDelayMs: this.retryDelay(retryAttempt) },
+      error: error instanceof Error ? error.message : String(error)
+    });
   }
   /**
    * Checks flush triggers and schedules/triggers flush as needed.
@@ -7040,22 +7124,26 @@ var MastraStorageExporter = class extends BaseExporter {
    * On other errors, re-adds events to the buffer for retry.
    */
   async flushCreates(signal, events, storageCall) {
-    if (events.length === 0) return;
+    if (events.length === 0) return FLUSH_SUCCEEDED2;
     if (this.#unsupportedSignals.has(signal)) {
       this.emitDrop(signal, "unsupported-storage", events.length);
-      return;
+      return { failed: true };
     }
     try {
       await storageCall(events);
+      return FLUSH_SUCCEEDED2;
     } catch (error$1) {
       if (error$1 instanceof error.MastraError && error$1.domain === error.ErrorDomain.MASTRA_OBSERVABILITY && error$1.id.endsWith("_NOT_IMPLEMENTED")) {
         this.logger.warn(error$1.message);
         this.#unsupportedSignals.add(signal);
         this.emitDrop(signal, "unsupported-storage", events.length, error$1);
-      } else {
-        const dropped = this.#eventBuffer.reAddCreates(events);
-        this.emitDrop(signal, "retry-exhausted", dropped.length, error$1);
+        return { failed: true };
       }
+      const dropped = this.#eventBuffer.reAddCreates(events);
+      const retryAttempt = this.retryAttempt(events);
+      this.logStorageFailure(signal, events, retryAttempt, error$1);
+      this.emitDrop(signal, "retry-exhausted", dropped.length, error$1);
+      return { failed: true, retryAttempt };
     }
   }
   /**
@@ -7064,10 +7152,10 @@ var MastraStorageExporter = class extends BaseExporter {
    */
   async flushSpanUpdates(events, deferredUpdates, isEnd) {
     const deferredCountAtEntry = deferredUpdates.length;
-    if (events.length === 0) return;
+    if (events.length === 0) return FLUSH_SUCCEEDED2;
     if (this.#unsupportedSignals.has("tracing")) {
       this.emitDrop("tracing", "unsupported-storage", events.length);
-      return;
+      return { failed: true };
     }
     const partials = [];
     for (const event of events) {
@@ -7082,26 +7170,30 @@ var MastraStorageExporter = class extends BaseExporter {
         deferredUpdates.push(event);
       }
     }
-    if (partials.length === 0) return;
+    if (partials.length === 0) return FLUSH_SUCCEEDED2;
     try {
       await this.#observabilityStorage.batchUpdateSpans({ records: partials });
       if (isEnd) {
         this.#eventBuffer.endFinishedSpans({ records: partials });
       }
+      return FLUSH_SUCCEEDED2;
     } catch (error$1) {
       if (error$1 instanceof error.MastraError && error$1.domain === error.ErrorDomain.MASTRA_OBSERVABILITY && error$1.id.endsWith("_NOT_IMPLEMENTED")) {
         this.logger.warn(error$1.message);
         this.#unsupportedSignals.add("tracing");
         deferredUpdates.length = 0;
         this.emitDrop("tracing", "unsupported-storage", events.length + deferredCountAtEntry, error$1);
-      } else {
-        const newlyDeferred = deferredUpdates.length - deferredCountAtEntry;
-        if (newlyDeferred > 0) {
-          deferredUpdates.splice(deferredUpdates.length - newlyDeferred, newlyDeferred);
-        }
-        const dropped = this.#eventBuffer.reAddUpdates(events);
-        this.emitDrop("tracing", "retry-exhausted", dropped.length, error$1);
+        return { failed: true };
+      }
+      const newlyDeferred = deferredUpdates.length - deferredCountAtEntry;
+      if (newlyDeferred > 0) {
+        deferredUpdates.splice(deferredUpdates.length - newlyDeferred, newlyDeferred);
       }
+      const dropped = this.#eventBuffer.reAddUpdates(events);
+      const retryAttempt = this.retryAttempt(events);
+      this.logStorageFailure("tracing", events, retryAttempt, error$1);
+      this.emitDrop("tracing", "retry-exhausted", dropped.length, error$1);
+      return { failed: true, retryAttempt };
     }
   }
   /**
@@ -7169,7 +7261,7 @@ var MastraStorageExporter = class extends BaseExporter {
           break;
       }
     }
-    await Promise.all([
+    const flushResults = await Promise.all([
       this.flushCreates(
         "feedback",
         createFeedbackEvents,
@@ -7197,25 +7289,36 @@ var MastraStorageExporter = class extends BaseExporter {
       })
     ]);
     const deferredUpdates = [];
-    await this.flushSpanUpdates(updateSpanEvents, deferredUpdates, false);
-    await this.flushSpanUpdates(endSpanEvents, deferredUpdates, true);
+    flushResults.push(await this.flushSpanUpdates(updateSpanEvents, deferredUpdates, false));
+    flushResults.push(await this.flushSpanUpdates(endSpanEvents, deferredUpdates, true));
+    let deferredDropCount = 0;
     if (deferredUpdates.length > 0) {
       if (this.#unsupportedSignals.has("tracing")) {
-        this.emitDrop("tracing", "unsupported-storage", deferredUpdates.length);
+        deferredDropCount = deferredUpdates.length;
+        this.emitDrop("tracing", "unsupported-storage", deferredDropCount);
         deferredUpdates.length = 0;
       } else {
         const dropped = this.#eventBuffer.reAddUpdates(deferredUpdates);
-        this.emitDrop("tracing", "retry-exhausted", dropped.length);
+        deferredDropCount = dropped.length;
+        this.emitDrop("tracing", "retry-exhausted", deferredDropCount);
       }
     }
-    const elapsed = Date.now() - startTime;
-    this.logger.debug("Batch flushed", {
-      strategy: this.#resolvedStrategy,
-      batchSize,
-      durationMs: elapsed,
-      deferredUpdates: deferredUpdates.length > 0 ? deferredUpdates.length : void 0
-    });
-    return;
+    const retryAttempt = flushResults.reduce((earliestAttempt, result) => {
+      if (result.retryAttempt === void 0) return earliestAttempt;
+      return earliestAttempt === void 0 ? result.retryAttempt : Math.min(earliestAttempt, result.retryAttempt);
+    }, void 0);
+    if (retryAttempt !== void 0) {
+      this.scheduleFlush(this.retryDelay(retryAttempt));
+    }
+    if (!flushResults.some((result) => result.failed) && deferredDropCount === 0) {
+      const elapsed = Date.now() - startTime;
+      this.logger.debug("Batch flushed", {
+        strategy: this.#resolvedStrategy,
+        batchSize,
+        durationMs: elapsed,
+        deferredUpdates: deferredUpdates.length > 0 ? deferredUpdates.length : void 0
+      });
+    }
   }
   async _exportTracingEvent(event) {
     await this.waitForInit();
@@ -7292,6 +7395,10 @@ var MastraStorageExporter = class extends BaseExporter {
       this.#flushTimer = void 0;
     }
     await this.flush();
+    if (this.#flushTimer) {
+      clearTimeout(this.#flushTimer);
+      this.#flushTimer = void 0;
+    }
     this.logger.info("MastraStorageExporter shutdown complete");
   }
 };