@mastra/otel-exporter 0.0.0-fix-9244-clickhouse-metadata-20251105010900 → 0.0.0-main-test-20251105183450

package/CHANGELOG.md

@@ -1,11 +1,41 @@
 # @mastra/otel-exporter
 
-## 0.0.0-fix-9244-clickhouse-metadata-20251105010900
+## 0.0.0-main-test-20251105183450
 
 ### Major Changes
 
 - Bump minimum required Node.js version to 22.13.0 ([#9706](https://github.com/mastra-ai/mastra/pull/9706))
 
+- ```([#9709](https://github.com/mastra-ai/mastra/pull/9709))
+  import { Mastra } from '@mastra/core';
+  import { Observability } from '@mastra/observability';  // Explicit import
+
+  const mastra = new Mastra({
+    ...other_config,
+    observability: new Observability({
+      default: { enabled: true }
+    })  // Instance
+  });
+  ```
+
+  Instead of:
+
+  ```
+  import { Mastra } from '@mastra/core';
+  import '@mastra/observability/init';  // Explicit import
+
+  const mastra = new Mastra({
+    ...other_config,
+    observability: {
+      default: { enabled: true }
+    }
+  });
+  ```
+
+  Also renamed a bunch of:
+  - `Tracing` things to `Observability` things.
+  - `AI-` things to just things.
+
 - Mark as stable ([`83d5942`](https://github.com/mastra-ai/mastra/commit/83d5942669ce7bba4a6ca4fd4da697a10eb5ebdc))
 
 - moved ai-tracing code into @mastra/observability ([#9661](https://github.com/mastra-ai/mastra/pull/9661))
@@ -36,9 +66,9 @@
 
 - Update peer dependencies to match core package version bump (1.0.0) ([#9237](https://github.com/mastra-ai/mastra/pull/9237))
 
-- Updated dependencies [[`f743dbb`](https://github.com/mastra-ai/mastra/commit/f743dbb8b40d1627b5c10c0e6fc154f4ebb6e394), [`fec5129`](https://github.com/mastra-ai/mastra/commit/fec5129de7fc64423ea03661a56cef31dc747a0d), [`0e8ed46`](https://github.com/mastra-ai/mastra/commit/0e8ed467c54d6901a6a365f270ec15d6faadb36c), [`6c049d9`](https://github.com/mastra-ai/mastra/commit/6c049d94063fdcbd5b81c4912a2bf82a92c9cc0b), [`3443770`](https://github.com/mastra-ai/mastra/commit/3443770662df8eb24c9df3589b2792d78cfcb811), [`f0a07e0`](https://github.com/mastra-ai/mastra/commit/f0a07e0111b3307c5fabfa4094c5c2cfb734fbe6), [`1521d71`](https://github.com/mastra-ai/mastra/commit/1521d716e5daedc74690c983fbd961123c56756b), [`9e1911d`](https://github.com/mastra-ai/mastra/commit/9e1911db2b4db85e0e768c3f15e0d61e319869f6), [`ebac155`](https://github.com/mastra-ai/mastra/commit/ebac15564a590117db7078233f927a7e28a85106), [`dd1c38d`](https://github.com/mastra-ai/mastra/commit/dd1c38d1b75f1b695c27b40d8d9d6ed00d5e0f6f), [`5948e6a`](https://github.com/mastra-ai/mastra/commit/5948e6a5146c83666ba3f294b2be576c82a513fb), [`83b08dc`](https://github.com/mastra-ai/mastra/commit/83b08dcf1bfcc915efab23c09207df90fa247908), [`8940859`](https://github.com/mastra-ai/mastra/commit/89408593658199b4ad67f7b65e888f344e64a442), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`e629310`](https://github.com/mastra-ai/mastra/commit/e629310f1a73fa236d49ec7a1d1cceb6229dc7cc), [`4c6b492`](https://github.com/mastra-ai/mastra/commit/4c6b492c4dd591c6a592520c1f6855d6e936d71f), [`dff01d8`](https://github.com/mastra-ai/mastra/commit/dff01d81ce1f4e4087cfac20fa868e6db138dd14), [`9d819d5`](https://github.com/mastra-ai/mastra/commit/9d819d54b61481639f4008e4694791bddf187edd), [`71c8d6c`](https://github.com/mastra-ai/mastra/commit/71c8d6c161253207b2b9588bdadb7eed604f7253), [`6179a9b`](https://github.com/mastra-ai/mastra/commit/6179a9ba36ffac326de3cc3c43cdc8028d37c251), [`00f4921`](https://github.com/mastra-ai/mastra/commit/00f4921dd2c91a1e5446799599ef7116a8214a1a), [`ca8041c`](https://github.com/mastra-ai/mastra/commit/ca8041cce0379fda22ed293a565bcb5b6ddca68a), [`7051bf3`](https://github.com/mastra-ai/mastra/commit/7051bf38b3b122a069008f861f7bfc004a6d9f6e), [`a8f1494`](https://github.com/mastra-ai/mastra/commit/a8f1494f4bbdc2770bcf327d4c7d869e332183f1), [`0793497`](https://github.com/mastra-ai/mastra/commit/079349753620c40246ffd673e3f9d7d9820beff3), [`5df9cce`](https://github.com/mastra-ai/mastra/commit/5df9cce1a753438413f64c11eeef8f845745c2a8), [`a854ede`](https://github.com/mastra-ai/mastra/commit/a854ede62bf5ac0945a624ac48913dd69c73aabf), [`c576fc0`](https://github.com/mastra-ai/mastra/commit/c576fc0b100b2085afded91a37c97a0ea0ec09c7), [`3defc80`](https://github.com/mastra-ai/mastra/commit/3defc80cf2b88a1b7fc1cc4ddcb91e982a614609), [`16153fe`](https://github.com/mastra-ai/mastra/commit/16153fe7eb13c99401f48e6ca32707c965ee28b9), [`9f4a683`](https://github.com/mastra-ai/mastra/commit/9f4a6833e88b52574665c028fd5508ad5c2f6004), [`bc94344`](https://github.com/mastra-ai/mastra/commit/bc943444a1342d8a662151b7bce1df7dae32f59c), [`57d157f`](https://github.com/mastra-ai/mastra/commit/57d157f0b163a95c3e6c9eae31bdb11d1bfc64f9), [`2a90c55`](https://github.com/mastra-ai/mastra/commit/2a90c55a86a9210697d5adaab5ee94584b079adc), [`96d35f6`](https://github.com/mastra-ai/mastra/commit/96d35f61376bc2b1bf148648a2c1985bd51bef55), [`5cbe88a`](https://github.com/mastra-ai/mastra/commit/5cbe88aefbd9f933bca669fd371ea36bf939ac6d), [`a1bd7b8`](https://github.com/mastra-ai/mastra/commit/a1bd7b8571db16b94eb01588f451a74758c96d65), [`d78b38d`](https://github.com/mastra-ai/mastra/commit/d78b38d898fce285260d3bbb4befade54331617f), [`0633100`](https://github.com/mastra-ai/mastra/commit/0633100a911ad22f5256471bdf753da21c104742), [`c710c16`](https://github.com/mastra-ai/mastra/commit/c710c1652dccfdc4111c8412bca7a6bb1d48b441), [`cfae733`](https://github.com/mastra-ai/mastra/commit/cfae73394f4920635e6c919c8e95ff9a0788e2e5), [`e3dfda7`](https://github.com/mastra-ai/mastra/commit/e3dfda7b11bf3b8c4bb55637028befb5f387fc74), [`844ea5d`](https://github.com/mastra-ai/mastra/commit/844ea5dc0c248961e7bf73629ae7dcff503e853c), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`0d7618b`](https://github.com/mastra-ai/mastra/commit/0d7618bc650bf2800934b243eca5648f4aeed9c2), [`7b763e5`](https://github.com/mastra-ai/mastra/commit/7b763e52fc3eaf699c2a99f2adf418dd46e4e9a5), [`d36cfbb`](https://github.com/mastra-ai/mastra/commit/d36cfbbb6565ba5f827883cc9bb648eb14befdc1), [`3697853`](https://github.com/mastra-ai/mastra/commit/3697853deeb72017d90e0f38a93c1e29221aeca0), [`a534e95`](https://github.com/mastra-ai/mastra/commit/a534e9591f83b3cc1ebff99c67edf4cda7bf81d3), [`9d0e7fe`](https://github.com/mastra-ai/mastra/commit/9d0e7feca8ed98de959f53476ee1456073673348), [`53d927c`](https://github.com/mastra-ai/mastra/commit/53d927cc6f03bff33655b7e2b788da445a08731d), [`22f64bc`](https://github.com/mastra-ai/mastra/commit/22f64bc1d37149480b58bf2fefe35b79a1e3e7d5), [`83d5942`](https://github.com/mastra-ai/mastra/commit/83d5942669ce7bba4a6ca4fd4da697a10eb5ebdc), [`bda6370`](https://github.com/mastra-ai/mastra/commit/bda637009360649aaf579919e7873e33553c273e), [`d7acd8e`](https://github.com/mastra-ai/mastra/commit/d7acd8e987b5d7eff4fd98b0906c17c06a2e83d5), [`c7f1f7d`](https://github.com/mastra-ai/mastra/commit/c7f1f7d24f61f247f018cc2d1f33bf63212959a7), [`0bddc6d`](https://github.com/mastra-ai/mastra/commit/0bddc6d8dbd6f6008c0cba2e4960a2da75a55af1), [`735d8c1`](https://github.com/mastra-ai/mastra/commit/735d8c1c0d19fbc09e6f8b66cf41bc7655993838), [`acf322e`](https://github.com/mastra-ai/mastra/commit/acf322e0f1fd0189684cf529d91c694bea918a45), [`c942802`](https://github.com/mastra-ai/mastra/commit/c942802a477a925b01859a7b8688d4355715caaa), [`a0c8c1b`](https://github.com/mastra-ai/mastra/commit/a0c8c1b87d4fee252aebda73e8637fbe01d761c9), [`cc34739`](https://github.com/mastra-ai/mastra/commit/cc34739c34b6266a91bea561119240a7acf47887), [`c218bd3`](https://github.com/mastra-ai/mastra/commit/c218bd3759e32423735b04843a09404572631014), [`2c4438b`](https://github.com/mastra-ai/mastra/commit/2c4438b87817ab7eed818c7990fef010475af1a3), [`2b8893c`](https://github.com/mastra-ai/mastra/commit/2b8893cb108ef9acb72ee7835cd625610d2c1a4a), [`8e5c75b`](https://github.com/mastra-ai/mastra/commit/8e5c75bdb1d08a42d45309a4c72def4b6890230f), [`fa8409b`](https://github.com/mastra-ai/mastra/commit/fa8409bc39cfd8ba6643b9db5269b90b22e2a2f7), [`173c535`](https://github.com/mastra-ai/mastra/commit/173c535c0645b0da404fe09f003778f0b0d4e019)]:
-  - @mastra/core@0.0.0-fix-9244-clickhouse-metadata-20251105010900
-  - @mastra/observability@0.0.0-fix-9244-clickhouse-metadata-20251105010900
+- Updated dependencies [[`f743dbb`](https://github.com/mastra-ai/mastra/commit/f743dbb8b40d1627b5c10c0e6fc154f4ebb6e394), [`fec5129`](https://github.com/mastra-ai/mastra/commit/fec5129de7fc64423ea03661a56cef31dc747a0d), [`0491e7c`](https://github.com/mastra-ai/mastra/commit/0491e7c9b714cb0ba22187ee062147ec2dd7c712), [`0e8ed46`](https://github.com/mastra-ai/mastra/commit/0e8ed467c54d6901a6a365f270ec15d6faadb36c), [`6c049d9`](https://github.com/mastra-ai/mastra/commit/6c049d94063fdcbd5b81c4912a2bf82a92c9cc0b), [`3443770`](https://github.com/mastra-ai/mastra/commit/3443770662df8eb24c9df3589b2792d78cfcb811), [`f0a07e0`](https://github.com/mastra-ai/mastra/commit/f0a07e0111b3307c5fabfa4094c5c2cfb734fbe6), [`aaa40e7`](https://github.com/mastra-ai/mastra/commit/aaa40e788628b319baa8e889407d11ad626547fa), [`1521d71`](https://github.com/mastra-ai/mastra/commit/1521d716e5daedc74690c983fbd961123c56756b), [`9e1911d`](https://github.com/mastra-ai/mastra/commit/9e1911db2b4db85e0e768c3f15e0d61e319869f6), [`ebac155`](https://github.com/mastra-ai/mastra/commit/ebac15564a590117db7078233f927a7e28a85106), [`dd1c38d`](https://github.com/mastra-ai/mastra/commit/dd1c38d1b75f1b695c27b40d8d9d6ed00d5e0f6f), [`5948e6a`](https://github.com/mastra-ai/mastra/commit/5948e6a5146c83666ba3f294b2be576c82a513fb), [`83b08dc`](https://github.com/mastra-ai/mastra/commit/83b08dcf1bfcc915efab23c09207df90fa247908), [`8940859`](https://github.com/mastra-ai/mastra/commit/89408593658199b4ad67f7b65e888f344e64a442), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`e629310`](https://github.com/mastra-ai/mastra/commit/e629310f1a73fa236d49ec7a1d1cceb6229dc7cc), [`4c6b492`](https://github.com/mastra-ai/mastra/commit/4c6b492c4dd591c6a592520c1f6855d6e936d71f), [`dff01d8`](https://github.com/mastra-ai/mastra/commit/dff01d81ce1f4e4087cfac20fa868e6db138dd14), [`9d819d5`](https://github.com/mastra-ai/mastra/commit/9d819d54b61481639f4008e4694791bddf187edd), [`71c8d6c`](https://github.com/mastra-ai/mastra/commit/71c8d6c161253207b2b9588bdadb7eed604f7253), [`6179a9b`](https://github.com/mastra-ai/mastra/commit/6179a9ba36ffac326de3cc3c43cdc8028d37c251), [`00f4921`](https://github.com/mastra-ai/mastra/commit/00f4921dd2c91a1e5446799599ef7116a8214a1a), [`ca8041c`](https://github.com/mastra-ai/mastra/commit/ca8041cce0379fda22ed293a565bcb5b6ddca68a), [`7051bf3`](https://github.com/mastra-ai/mastra/commit/7051bf38b3b122a069008f861f7bfc004a6d9f6e), [`a8f1494`](https://github.com/mastra-ai/mastra/commit/a8f1494f4bbdc2770bcf327d4c7d869e332183f1), [`0793497`](https://github.com/mastra-ai/mastra/commit/079349753620c40246ffd673e3f9d7d9820beff3), [`5df9cce`](https://github.com/mastra-ai/mastra/commit/5df9cce1a753438413f64c11eeef8f845745c2a8), [`a854ede`](https://github.com/mastra-ai/mastra/commit/a854ede62bf5ac0945a624ac48913dd69c73aabf), [`c576fc0`](https://github.com/mastra-ai/mastra/commit/c576fc0b100b2085afded91a37c97a0ea0ec09c7), [`3defc80`](https://github.com/mastra-ai/mastra/commit/3defc80cf2b88a1b7fc1cc4ddcb91e982a614609), [`16153fe`](https://github.com/mastra-ai/mastra/commit/16153fe7eb13c99401f48e6ca32707c965ee28b9), [`9f4a683`](https://github.com/mastra-ai/mastra/commit/9f4a6833e88b52574665c028fd5508ad5c2f6004), [`bc94344`](https://github.com/mastra-ai/mastra/commit/bc943444a1342d8a662151b7bce1df7dae32f59c), [`57d157f`](https://github.com/mastra-ai/mastra/commit/57d157f0b163a95c3e6c9eae31bdb11d1bfc64f9), [`2a90c55`](https://github.com/mastra-ai/mastra/commit/2a90c55a86a9210697d5adaab5ee94584b079adc), [`96d35f6`](https://github.com/mastra-ai/mastra/commit/96d35f61376bc2b1bf148648a2c1985bd51bef55), [`5cbe88a`](https://github.com/mastra-ai/mastra/commit/5cbe88aefbd9f933bca669fd371ea36bf939ac6d), [`a1bd7b8`](https://github.com/mastra-ai/mastra/commit/a1bd7b8571db16b94eb01588f451a74758c96d65), [`d78b38d`](https://github.com/mastra-ai/mastra/commit/d78b38d898fce285260d3bbb4befade54331617f), [`0633100`](https://github.com/mastra-ai/mastra/commit/0633100a911ad22f5256471bdf753da21c104742), [`c710c16`](https://github.com/mastra-ai/mastra/commit/c710c1652dccfdc4111c8412bca7a6bb1d48b441), [`354ad0b`](https://github.com/mastra-ai/mastra/commit/354ad0b7b1b8183ac567f236a884fc7ede6d7138), [`cfae733`](https://github.com/mastra-ai/mastra/commit/cfae73394f4920635e6c919c8e95ff9a0788e2e5), [`e3dfda7`](https://github.com/mastra-ai/mastra/commit/e3dfda7b11bf3b8c4bb55637028befb5f387fc74), [`844ea5d`](https://github.com/mastra-ai/mastra/commit/844ea5dc0c248961e7bf73629ae7dcff503e853c), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`0d7618b`](https://github.com/mastra-ai/mastra/commit/0d7618bc650bf2800934b243eca5648f4aeed9c2), [`7b763e5`](https://github.com/mastra-ai/mastra/commit/7b763e52fc3eaf699c2a99f2adf418dd46e4e9a5), [`d36cfbb`](https://github.com/mastra-ai/mastra/commit/d36cfbbb6565ba5f827883cc9bb648eb14befdc1), [`3697853`](https://github.com/mastra-ai/mastra/commit/3697853deeb72017d90e0f38a93c1e29221aeca0), [`a534e95`](https://github.com/mastra-ai/mastra/commit/a534e9591f83b3cc1ebff99c67edf4cda7bf81d3), [`9d0e7fe`](https://github.com/mastra-ai/mastra/commit/9d0e7feca8ed98de959f53476ee1456073673348), [`53d927c`](https://github.com/mastra-ai/mastra/commit/53d927cc6f03bff33655b7e2b788da445a08731d), [`22f64bc`](https://github.com/mastra-ai/mastra/commit/22f64bc1d37149480b58bf2fefe35b79a1e3e7d5), [`83d5942`](https://github.com/mastra-ai/mastra/commit/83d5942669ce7bba4a6ca4fd4da697a10eb5ebdc), [`bda6370`](https://github.com/mastra-ai/mastra/commit/bda637009360649aaf579919e7873e33553c273e), [`d7acd8e`](https://github.com/mastra-ai/mastra/commit/d7acd8e987b5d7eff4fd98b0906c17c06a2e83d5), [`c7f1f7d`](https://github.com/mastra-ai/mastra/commit/c7f1f7d24f61f247f018cc2d1f33bf63212959a7), [`0bddc6d`](https://github.com/mastra-ai/mastra/commit/0bddc6d8dbd6f6008c0cba2e4960a2da75a55af1), [`735d8c1`](https://github.com/mastra-ai/mastra/commit/735d8c1c0d19fbc09e6f8b66cf41bc7655993838), [`acf322e`](https://github.com/mastra-ai/mastra/commit/acf322e0f1fd0189684cf529d91c694bea918a45), [`c942802`](https://github.com/mastra-ai/mastra/commit/c942802a477a925b01859a7b8688d4355715caaa), [`a0c8c1b`](https://github.com/mastra-ai/mastra/commit/a0c8c1b87d4fee252aebda73e8637fbe01d761c9), [`cc34739`](https://github.com/mastra-ai/mastra/commit/cc34739c34b6266a91bea561119240a7acf47887), [`c218bd3`](https://github.com/mastra-ai/mastra/commit/c218bd3759e32423735b04843a09404572631014), [`2c4438b`](https://github.com/mastra-ai/mastra/commit/2c4438b87817ab7eed818c7990fef010475af1a3), [`2b8893c`](https://github.com/mastra-ai/mastra/commit/2b8893cb108ef9acb72ee7835cd625610d2c1a4a), [`8e5c75b`](https://github.com/mastra-ai/mastra/commit/8e5c75bdb1d08a42d45309a4c72def4b6890230f), [`fa8409b`](https://github.com/mastra-ai/mastra/commit/fa8409bc39cfd8ba6643b9db5269b90b22e2a2f7), [`173c535`](https://github.com/mastra-ai/mastra/commit/173c535c0645b0da404fe09f003778f0b0d4e019)]:
+  - @mastra/core@0.0.0-main-test-20251105183450
+  - @mastra/observability@0.0.0-main-test-20251105183450
 
 ## 0.2.0
 

package/dist/index.cjs

@@ -7,7 +7,7 @@ var resources = require('@opentelemetry/resources');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 
-// src/ai-tracing.ts
+// src/tracing.ts
 
 // src/loadExporter.ts
 var OTLPHttpExporter;
@@ -225,45 +225,45 @@ var MastraReadableSpan = class {
   droppedAttributesCount = 0;
   droppedEventsCount = 0;
   droppedLinksCount = 0;
-  constructor(aiSpan, attributes, kind, parentSpanId, resource, instrumentationLibrary) {
-    this.name = aiSpan.name;
+  constructor(span, attributes, kind, parentSpanId, resource, instrumentationLibrary) {
+    this.name = span.name;
     this.kind = kind;
     this.attributes = attributes;
     this.parentSpanId = parentSpanId;
     this.links = [];
     this.events = [];
-    this.startTime = this.dateToHrTime(aiSpan.startTime);
-    this.endTime = aiSpan.endTime ? this.dateToHrTime(aiSpan.endTime) : this.startTime;
-    this.ended = !!aiSpan.endTime;
-    if (aiSpan.endTime) {
-      const durationMs = aiSpan.endTime.getTime() - aiSpan.startTime.getTime();
+    this.startTime = this.dateToHrTime(span.startTime);
+    this.endTime = span.endTime ? this.dateToHrTime(span.endTime) : this.startTime;
+    this.ended = !!span.endTime;
+    if (span.endTime) {
+      const durationMs = span.endTime.getTime() - span.startTime.getTime();
       this.duration = [Math.floor(durationMs / 1e3), durationMs % 1e3 * 1e6];
     } else {
       this.duration = [0, 0];
     }
-    if (aiSpan.errorInfo) {
+    if (span.errorInfo) {
       this.status = {
         code: api.SpanStatusCode.ERROR,
-        message: aiSpan.errorInfo.message
+        message: span.errorInfo.message
       };
       this.events.push({
         name: "exception",
         attributes: {
-          "exception.message": aiSpan.errorInfo.message,
+          "exception.message": span.errorInfo.message,
           "exception.type": "Error",
-          ...aiSpan.errorInfo.details?.stack && {
-            "exception.stacktrace": aiSpan.errorInfo.details.stack
+          ...span.errorInfo.details?.stack && {
+            "exception.stacktrace": span.errorInfo.details.stack
           }
         },
         time: this.startTime,
         droppedAttributesCount: 0
       });
-    } else if (aiSpan.endTime) {
+    } else if (span.endTime) {
       this.status = { code: api.SpanStatusCode.OK };
     } else {
       this.status = { code: api.SpanStatusCode.UNSET };
     }
-    if (aiSpan.isEvent) {
+    if (span.isEvent) {
       this.events.push({
         name: "instant_event",
         attributes: {},
@@ -272,14 +272,14 @@ var MastraReadableSpan = class {
       });
     }
     this.spanContext = () => ({
-      traceId: aiSpan.traceId,
-      spanId: aiSpan.id,
+      traceId: span.traceId,
+      spanId: span.id,
       traceFlags: api.TraceFlags.SAMPLED,
       isRemote: false
     });
     if (parentSpanId) {
       this.parentSpanContext = {
-        traceId: aiSpan.traceId,
+        traceId: span.traceId,
         spanId: parentSpanId,
         traceFlags: api.TraceFlags.SAMPLED,
         isRemote: false
@@ -306,13 +306,13 @@ var MastraReadableSpan = class {
 // src/span-converter.ts
 var SPAN_KIND_MAPPING = {
   // Model operations are CLIENT spans (calling external AI services)
-  [observability$1.AISpanType.MODEL_GENERATION]: api.SpanKind.CLIENT,
-  [observability$1.AISpanType.MODEL_CHUNK]: api.SpanKind.CLIENT,
+  [observability$1.SpanType.MODEL_GENERATION]: api.SpanKind.CLIENT,
+  [observability$1.SpanType.MODEL_CHUNK]: api.SpanKind.CLIENT,
   // MCP tool calls are CLIENT (external service calls)
-  [observability$1.AISpanType.MCP_TOOL_CALL]: api.SpanKind.CLIENT,
+  [observability$1.SpanType.MCP_TOOL_CALL]: api.SpanKind.CLIENT,
   // Root spans for agent/workflow are SERVER (entry points)
-  [observability$1.AISpanType.AGENT_RUN]: api.SpanKind.SERVER,
-  [observability$1.AISpanType.WORKFLOW_RUN]: api.SpanKind.SERVER
+  [observability$1.SpanType.AGENT_RUN]: api.SpanKind.SERVER,
+  [observability$1.SpanType.WORKFLOW_RUN]: api.SpanKind.SERVER
 };
 var SpanConverter = class {
   resource;
@@ -325,19 +325,19 @@ var SpanConverter = class {
     };
   }
   /**
-   * Convert a Mastra AI span to an OpenTelemetry ReadableSpan
+   * Convert a Mastra Span to an OpenTelemetry ReadableSpan
    * This preserves Mastra's trace and span IDs
    */
-  convertSpan(aiSpan) {
-    const spanKind = this.getSpanKind(aiSpan);
-    const attributes = this.buildAttributes(aiSpan);
-    const spanName = this.buildSpanName(aiSpan);
-    const otelSpan = { ...aiSpan, name: spanName };
+  convertSpan(Span) {
+    const spanKind = this.getSpanKind(Span);
+    const attributes = this.buildAttributes(Span);
+    const spanName = this.buildSpanName(Span);
+    const otelSpan = { ...Span, name: spanName };
     return new MastraReadableSpan(
       otelSpan,
       attributes,
       spanKind,
-      aiSpan.parentSpanId,
+      Span.parentSpanId,
       // Use the parentSpanId from the Mastra span directly
       this.resource,
       this.instrumentationLibrary
@@ -346,81 +346,81 @@ var SpanConverter = class {
   /**
    * Get the appropriate SpanKind based on span type and context
    */
-  getSpanKind(aiSpan) {
-    if (aiSpan.isRootSpan) {
-      if (aiSpan.type === observability$1.AISpanType.AGENT_RUN || aiSpan.type === observability$1.AISpanType.WORKFLOW_RUN) {
+  getSpanKind(Span) {
+    if (Span.isRootSpan) {
+      if (Span.type === observability$1.SpanType.AGENT_RUN || Span.type === observability$1.SpanType.WORKFLOW_RUN) {
         return api.SpanKind.SERVER;
       }
     }
-    return SPAN_KIND_MAPPING[aiSpan.type] || api.SpanKind.INTERNAL;
+    return SPAN_KIND_MAPPING[Span.type] || api.SpanKind.INTERNAL;
   }
   /**
    * Build OTEL-compliant span name based on span type and attributes
    */
-  buildSpanName(aiSpan) {
-    switch (aiSpan.type) {
-      case observability$1.AISpanType.MODEL_GENERATION: {
-        const attrs = aiSpan.attributes;
+  buildSpanName(Span) {
+    switch (Span.type) {
+      case observability$1.SpanType.MODEL_GENERATION: {
+        const attrs = Span.attributes;
         const operation = attrs?.resultType === "tool_selection" ? "tool_selection" : "chat";
         const model = attrs?.model || "unknown";
         return `${operation} ${model}`;
       }
-      case observability$1.AISpanType.TOOL_CALL:
-      case observability$1.AISpanType.MCP_TOOL_CALL: {
-        const toolAttrs = aiSpan.attributes;
+      case observability$1.SpanType.TOOL_CALL:
+      case observability$1.SpanType.MCP_TOOL_CALL: {
+        const toolAttrs = Span.attributes;
         const toolName = toolAttrs?.toolId || "unknown";
         return `tool.execute ${toolName}`;
       }
-      case observability$1.AISpanType.AGENT_RUN: {
-        const agentAttrs = aiSpan.attributes;
+      case observability$1.SpanType.AGENT_RUN: {
+        const agentAttrs = Span.attributes;
         const agentId = agentAttrs?.agentId || "unknown";
         return `agent.${agentId}`;
       }
-      case observability$1.AISpanType.WORKFLOW_RUN: {
-        const workflowAttrs = aiSpan.attributes;
+      case observability$1.SpanType.WORKFLOW_RUN: {
+        const workflowAttrs = Span.attributes;
         const workflowId = workflowAttrs?.workflowId || "unknown";
         return `workflow.${workflowId}`;
       }
-      case observability$1.AISpanType.WORKFLOW_STEP:
-        return aiSpan.name;
+      case observability$1.SpanType.WORKFLOW_STEP:
+        return Span.name;
       default:
-        return aiSpan.name;
+        return Span.name;
     }
   }
   /**
-   * Build OpenTelemetry attributes from Mastra AI span
+   * Build OpenTelemetry attributes from Mastra Span
    * Following OTEL Semantic Conventions for GenAI
    */
-  buildAttributes(aiSpan) {
+  buildAttributes(Span) {
     const attributes = {};
-    attributes["gen_ai.operation.name"] = this.getOperationName(aiSpan);
-    attributes["span.kind"] = this.getSpanKindString(aiSpan);
-    attributes["mastra.span.type"] = aiSpan.type;
-    attributes["mastra.trace_id"] = aiSpan.traceId;
-    attributes["mastra.span_id"] = aiSpan.id;
-    if (aiSpan.parentSpanId) {
-      attributes["mastra.parent_span_id"] = aiSpan.parentSpanId;
+    attributes["gen_ai.operation.name"] = this.getOperationName(Span);
+    attributes["span.kind"] = this.getSpanKindString(Span);
+    attributes["mastra.span.type"] = Span.type;
+    attributes["mastra.trace_id"] = Span.traceId;
+    attributes["mastra.span_id"] = Span.id;
+    if (Span.parentSpanId) {
+      attributes["mastra.parent_span_id"] = Span.parentSpanId;
     }
-    if (aiSpan.input !== void 0) {
-      const inputStr = typeof aiSpan.input === "string" ? aiSpan.input : JSON.stringify(aiSpan.input);
+    if (Span.input !== void 0) {
+      const inputStr = typeof Span.input === "string" ? Span.input : JSON.stringify(Span.input);
       attributes["input"] = inputStr;
-      if (aiSpan.type === observability$1.AISpanType.MODEL_GENERATION) {
+      if (Span.type === observability$1.SpanType.MODEL_GENERATION) {
         attributes["gen_ai.prompt"] = inputStr;
-      } else if (aiSpan.type === observability$1.AISpanType.TOOL_CALL || aiSpan.type === observability$1.AISpanType.MCP_TOOL_CALL) {
+      } else if (Span.type === observability$1.SpanType.TOOL_CALL || Span.type === observability$1.SpanType.MCP_TOOL_CALL) {
         attributes["gen_ai.tool.input"] = inputStr;
       }
     }
-    if (aiSpan.output !== void 0) {
-      const outputStr = typeof aiSpan.output === "string" ? aiSpan.output : JSON.stringify(aiSpan.output);
+    if (Span.output !== void 0) {
+      const outputStr = typeof Span.output === "string" ? Span.output : JSON.stringify(Span.output);
       attributes["output"] = outputStr;
-      if (aiSpan.type === observability$1.AISpanType.MODEL_GENERATION) {
+      if (Span.type === observability$1.SpanType.MODEL_GENERATION) {
         attributes["gen_ai.completion"] = outputStr;
-      } else if (aiSpan.type === observability$1.AISpanType.TOOL_CALL || aiSpan.type === observability$1.AISpanType.MCP_TOOL_CALL) {
+      } else if (Span.type === observability$1.SpanType.TOOL_CALL || Span.type === observability$1.SpanType.MCP_TOOL_CALL) {
         attributes["gen_ai.tool.output"] = outputStr;
       }
     }
-    if (aiSpan.type === observability$1.AISpanType.MODEL_GENERATION && aiSpan.attributes) {
-      const modelAttrs = aiSpan.attributes;
+    if (Span.type === observability$1.SpanType.MODEL_GENERATION && Span.attributes) {
+      const modelAttrs = Span.attributes;
       if (modelAttrs.model) {
         attributes["gen_ai.request.model"] = modelAttrs.model;
       }
@@ -473,12 +473,12 @@ var SpanConverter = class {
         attributes["gen_ai.response.finish_reasons"] = modelAttrs.finishReason;
       }
     }
-    if ((aiSpan.type === observability$1.AISpanType.TOOL_CALL || aiSpan.type === observability$1.AISpanType.MCP_TOOL_CALL) && aiSpan.attributes) {
-      const toolAttrs = aiSpan.attributes;
+    if ((Span.type === observability$1.SpanType.TOOL_CALL || Span.type === observability$1.SpanType.MCP_TOOL_CALL) && Span.attributes) {
+      const toolAttrs = Span.attributes;
       if (toolAttrs.toolId) {
         attributes["gen_ai.tool.name"] = toolAttrs.toolId;
       }
-      if (aiSpan.type === observability$1.AISpanType.MCP_TOOL_CALL) {
+      if (Span.type === observability$1.SpanType.MCP_TOOL_CALL) {
         const mcpAttrs = toolAttrs;
         if (mcpAttrs.mcpServer) {
           attributes["mcp.server"] = mcpAttrs.mcpServer;
@@ -495,8 +495,8 @@ var SpanConverter = class {
         attributes["gen_ai.tool.success"] = toolAttrs.success;
       }
     }
-    if (aiSpan.type === observability$1.AISpanType.AGENT_RUN && aiSpan.attributes) {
-      const agentAttrs = aiSpan.attributes;
+    if (Span.type === observability$1.SpanType.AGENT_RUN && Span.attributes) {
+      const agentAttrs = Span.attributes;
       if (agentAttrs.agentId) {
         attributes["agent.id"] = agentAttrs.agentId;
         attributes["gen_ai.agent.id"] = agentAttrs.agentId;
@@ -508,8 +508,8 @@ var SpanConverter = class {
         attributes["agent.available_tools"] = JSON.stringify(agentAttrs.availableTools);
       }
     }
-    if (aiSpan.type === observability$1.AISpanType.WORKFLOW_RUN && aiSpan.attributes) {
-      const workflowAttrs = aiSpan.attributes;
+    if (Span.type === observability$1.SpanType.WORKFLOW_RUN && Span.attributes) {
+      const workflowAttrs = Span.attributes;
       if (workflowAttrs.workflowId) {
         attributes["workflow.id"] = workflowAttrs.workflowId;
       }
@@ -517,19 +517,19 @@ var SpanConverter = class {
         attributes["workflow.status"] = workflowAttrs.status;
       }
     }
-    if (aiSpan.errorInfo) {
+    if (Span.errorInfo) {
       attributes["error"] = true;
-      attributes["error.type"] = aiSpan.errorInfo.id || "unknown";
-      attributes["error.message"] = aiSpan.errorInfo.message;
-      if (aiSpan.errorInfo.domain) {
-        attributes["error.domain"] = aiSpan.errorInfo.domain;
+      attributes["error.type"] = Span.errorInfo.id || "unknown";
+      attributes["error.message"] = Span.errorInfo.message;
+      if (Span.errorInfo.domain) {
+        attributes["error.domain"] = Span.errorInfo.domain;
       }
-      if (aiSpan.errorInfo.category) {
-        attributes["error.category"] = aiSpan.errorInfo.category;
+      if (Span.errorInfo.category) {
+        attributes["error.category"] = Span.errorInfo.category;
       }
     }
-    if (aiSpan.metadata) {
-      Object.entries(aiSpan.metadata).forEach(([key, value]) => {
+    if (Span.metadata) {
+      Object.entries(Span.metadata).forEach(([key, value]) => {
         if (!attributes[key]) {
           if (value === null || value === void 0) {
             return;
@@ -542,12 +542,12 @@ var SpanConverter = class {
         }
       });
     }
-    if (aiSpan.startTime) {
-      attributes["mastra.start_time"] = aiSpan.startTime.toISOString();
+    if (Span.startTime) {
+      attributes["mastra.start_time"] = Span.startTime.toISOString();
     }
-    if (aiSpan.endTime) {
-      attributes["mastra.end_time"] = aiSpan.endTime.toISOString();
-      const duration = aiSpan.endTime.getTime() - aiSpan.startTime.getTime();
+    if (Span.endTime) {
+      attributes["mastra.end_time"] = Span.endTime.toISOString();
+      const duration = Span.endTime.getTime() - Span.startTime.getTime();
       attributes["mastra.duration_ms"] = duration;
     }
     return attributes;
@@ -555,28 +555,28 @@ var SpanConverter = class {
   /**
    * Get the operation name based on span type for gen_ai.operation.name
    */
-  getOperationName(aiSpan) {
-    switch (aiSpan.type) {
-      case observability$1.AISpanType.MODEL_GENERATION: {
-        const attrs = aiSpan.attributes;
+  getOperationName(Span) {
+    switch (Span.type) {
+      case observability$1.SpanType.MODEL_GENERATION: {
+        const attrs = Span.attributes;
         return attrs?.resultType === "tool_selection" ? "tool_selection" : "chat";
       }
-      case observability$1.AISpanType.TOOL_CALL:
-      case observability$1.AISpanType.MCP_TOOL_CALL:
+      case observability$1.SpanType.TOOL_CALL:
+      case observability$1.SpanType.MCP_TOOL_CALL:
         return "tool.execute";
-      case observability$1.AISpanType.AGENT_RUN:
+      case observability$1.SpanType.AGENT_RUN:
         return "agent.run";
-      case observability$1.AISpanType.WORKFLOW_RUN:
+      case observability$1.SpanType.WORKFLOW_RUN:
         return "workflow.run";
       default:
-        return aiSpan.type.replace(/_/g, ".");
+        return Span.type.replace(/_/g, ".");
     }
   }
   /**
    * Get span kind as string for attribute
    */
-  getSpanKindString(aiSpan) {
-    const kind = this.getSpanKind(aiSpan);
+  getSpanKindString(Span) {
+    const kind = this.getSpanKind(Span);
     switch (kind) {
       case api.SpanKind.SERVER:
         return "server";
@@ -594,7 +594,7 @@ var SpanConverter = class {
   }
 };
 
-// src/ai-tracing.ts
+// src/tracing.ts
 var OtelExporter = class extends observability.BaseExporter {
   config;
   tracingConfig;
@@ -728,8 +728,8 @@ var OtelExporter = class extends observability.BaseExporter {
     await this.setupProcessor();
     this.isSetup = true;
   }
-  async _exportEvent(event) {
-    if (event.type !== observability$1.AITracingEventType.SPAN_ENDED) {
+  async _exportTracingEvent(event) {
+    if (event.type !== observability$1.TracingEventType.SPAN_ENDED) {
       return;
     }
     const span = event.exportedSpan;