braintrust 3.25.0 → 3.27.0

package/dist/auto-instrumentations/{chunk-7P6563SW.mjs → chunk-BW33ULMW.mjs}

@@ -1,14 +1,10 @@
 import {
   unplugin
-} from "./chunk-JPVCUKTY.mjs";
+} from "./chunk-XEYKUBLY.mjs";
 
 // src/auto-instrumentations/bundler/webpack.ts
 function braintrustWebpackPlugin(options = {}) {
-  const { useDiagnosticChannelCompatShim = false, ...pluginOptions } = options;
-  return unplugin.webpack({
-    ...pluginOptions,
-    browser: useDiagnosticChannelCompatShim
-  });
+  return unplugin.webpack(options);
 }
 var webpackPlugin = unplugin.webpack;
 

package/dist/auto-instrumentations/{chunk-M6DLIJ2Z.mjs → chunk-I55G56ZL.mjs}

@@ -1,3 +1,10 @@
+import {
+  GLOBAL_INSTRUMENTATION_HOOKS_KEY,
+  GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION,
+  GLOBAL_INSTRUMENTATION_HOOKS_REGISTRY_BRAND,
+  GLOBAL_INSTRUMENTATION_HOOK_BRAND
+} from "./chunk-JPUFNW7X.mjs";
+
 // src/auto-instrumentations/orchestrion-js/matcher.ts
 import semifies from "semifies";
 
@@ -10,52 +17,76 @@ import { SourceMapGenerator } from "source-map";
 // src/auto-instrumentations/orchestrion-js/transforms.ts
 import esquery from "esquery";
 import { parse } from "meriyah";
-var tracingChannelPredicate = (node) => node.declarations?.[0]?.id?.properties?.[0]?.value?.name === "tr_ch_apm_tracingChannel";
 var CHANNEL_REGEX = /[^\w]/g;
+var SHARED_HOOK_LOOKUP = "tr_ch_bt$get_hook";
 function formatChannelVariable(channelName) {
-  return `tr_ch_apm$${channelName.replace(CHANNEL_REGEX, "_")}`;
+  return `tr_ch_bt$${channelName.replace(CHANNEL_REGEX, "_")}`;
+}
+function formatChannelGetter(channelName) {
+  return `tr_ch_bt$get_${channelName.replace(CHANNEL_REGEX, "_")}`;
 }
 var transforms = {
-  tracingChannelImport({ dcModule, moduleType }, node) {
-    if (node.body.some(tracingChannelPredicate)) {
-      return;
-    }
-    const options = { module: moduleType === "esm" };
-    const index = node.body.findIndex(
-      (child) => child.directive === "use strict"
-    );
-    const dc = moduleType === "esm" ? `import tr_ch_apm_dc from "${dcModule}"` : `const tr_ch_apm_dc = ${"require"}("${dcModule}")`;
-    const tracingChannel = "const { tracingChannel: tr_ch_apm_tracingChannel } = tr_ch_apm_dc";
-    const hasSubscribers = `const tr_ch_apm_hasSubscribers = ch => ch.start.hasSubscribers
-      || ch.end.hasSubscribers
-      || ch.asyncStart.hasSubscribers
-      || ch.asyncEnd.hasSubscribers
-      || ch.error.hasSubscribers`;
-    node.body.splice(
-      index + 1,
-      0,
-      parse(dc, options).body[0],
-      parse(tracingChannel, options).body[0],
-      parse(hasSubscribers, options).body[0]
-    );
-  },
-  tracingChannelDeclaration(state, node) {
+  tracingHookDeclaration(state, node) {
     const {
       channelName,
       module: { name }
     } = state;
     const channelVariable = formatChannelVariable(channelName);
+    const channelGetter = formatChannelGetter(channelName);
+    const hasSharedHookLookup = node.body.some(
+      (child) => child.declarations?.[0]?.id?.name === SHARED_HOOK_LOOKUP
+    );
     if (node.body.some(
-      (child) => child.declarations?.[0]?.id?.name === channelVariable
+      (child) => child.declarations?.[0]?.id?.name === channelGetter
     )) {
       return;
     }
-    transforms.tracingChannelImport(state, node, null, []);
-    const index = node.body.findIndex(tracingChannelPredicate);
+    const sharedHookLookup = hasSharedHookLookup ? "" : `
+      const ${SHARED_HOOK_LOOKUP} = (__bt$hookName) => {
+        try {
+          const __bt$hooks = globalThis[${JSON.stringify(
+      GLOBAL_INSTRUMENTATION_HOOKS_KEY
+    )}];
+          if (
+            !(__bt$hooks instanceof Map) ||
+            __bt$hooks[Symbol.for(${JSON.stringify(
+      GLOBAL_INSTRUMENTATION_HOOKS_REGISTRY_BRAND
+    )})] !== ${GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION}
+          ) return undefined;
+          const __bt$hook = Map.prototype.get.call(
+            __bt$hooks,
+            __bt$hookName
+          );
+          if (
+            (__bt$hook === null ||
+              (typeof __bt$hook !== "object" &&
+                typeof __bt$hook !== "function")) ||
+            __bt$hook[Symbol.for(${JSON.stringify(
+      GLOBAL_INSTRUMENTATION_HOOK_BRAND
+    )})] !== ${GLOBAL_INSTRUMENTATION_HOOKS_PROTOCOL_VERSION} ||
+            typeof __bt$hook.traceInvocation !== "function"
+          ) return undefined;
+          return __bt$hook;
+        } catch {
+          return undefined;
+        }
+      };
+    `;
     const code = `
-      const ${channelVariable} = tr_ch_apm_tracingChannel("orchestrion:${name}:${channelName}")
+      ${sharedHookLookup}
+      let ${channelVariable};
+      const ${channelGetter} = () =>
+        ${channelVariable} ??= ${SHARED_HOOK_LOOKUP}(
+          ${JSON.stringify(`orchestrion:${name}:${channelName}`)}
+        );
     `;
-    node.body.splice(index + 1, 0, parse(code).body[0]);
+    const sharedHookLookupIndex = node.body.findIndex(
+      (child) => child.declarations?.[0]?.id?.name === SHARED_HOOK_LOOKUP
+    );
+    const index = sharedHookLookupIndex === -1 ? node.body.findIndex(
+      (child) => child.directive === "use strict"
+    ) : sharedHookLookupIndex;
+    node.body.splice(index + 1, 0, ...parse(code).body);
   },
   traceCallback: traceAny,
   tracePromise: traceAny,
@@ -70,25 +101,21 @@ function traceAny(state, node, _parent, ancestry) {
   }
 }
 function traceFunction(state, node, program) {
-  transforms.tracingChannelDeclaration(state, program, null, []);
+  transforms.tracingHookDeclaration(state, program, null, []);
   const { functionQuery } = state;
   const methodName = "methodName" in functionQuery ? functionQuery.methodName : void 0;
   const privateMethodName = "privateMethodName" in functionQuery ? functionQuery.privateMethodName : void 0;
   const functionName = "functionName" in functionQuery ? functionQuery.functionName : void 0;
   const isConstructor = methodName === "constructor" || !methodName && !privateMethodName && !functionName;
   const type = isConstructor ? "ArrowFunctionExpression" : "FunctionExpression";
-  node.body = wrap(
-    state,
-    {
-      type,
-      params: node.params,
-      body: node.body,
-      async: node.async,
-      expression: false,
-      generator: node.generator
-    },
-    program
-  );
+  node.body = wrap(state, {
+    type,
+    params: node.params,
+    body: node.body,
+    async: node.async,
+    expression: false,
+    generator: node.generator
+  });
   node.generator = false;
   node.async = false;
   wrapSuper(node);
@@ -100,11 +127,11 @@ function traceInstanceMethod(state, node, program) {
     return;
   }
   const classBody = node.body;
-  if (classBody.body.some(({ key }) => key.name === methodName)) {
+  if (classBody.body.some(({ key }) => key?.name === methodName)) {
     return;
   }
   let ctor = classBody.body.find(({ kind }) => kind === "constructor");
-  transforms.tracingChannelDeclaration(state, program, null, []);
+  transforms.tracingHookDeclaration(state, program, null, []);
   if (!ctor) {
     ctor = parse(
       node.superClass ? "class A extends Object { constructor (...args) { super(...args) } }" : "class A { constructor () {} }"
@@ -112,47 +139,36 @@ function traceInstanceMethod(state, node, program) {
     classBody.body.unshift(ctor);
   }
   const ctorBody = parse(`
-    const __apm$${methodName} = this["${methodName}"]
+    const __bt$${methodName} = this["${methodName}"]
     this["${methodName}"] = function () {}
   `).body;
   const fn = ctorBody[1].expression.right;
   fn.async = operator === "tracePromise";
-  fn.body = wrap(
-    state,
-    { type: "Identifier", name: `__apm$${methodName}` },
-    program
-  );
+  fn.body = wrap(state, {
+    type: "Identifier",
+    name: `__bt$${methodName}`
+  });
   wrapSuper(fn);
   ctor.value.body.body.push(...ctorBody);
 }
-function wrap(state, node, program) {
-  const { operator, moduleVersion } = state;
-  const wrapper = operator === "traceCallback" ? wrapCallback(state) : operator === "tracePromise" ? wrapPromise(state) : wrapSync(state);
+function wrap(state, node) {
+  const wrapper = wrapInvocation(state);
   const block = wrapper.body[0].body;
   const common = parse(
     node.type === "ArrowFunctionExpression" ? `
-    const __apm$ctx = {
-      arguments,
-      moduleVersion: ${JSON.stringify(moduleVersion)}
-    };
-    const __apm$traced = () => {
-      const __apm$wrapped = () => {};
-      return __apm$wrapped(...arguments);
+    const __bt$target = (...__bt$args) => {
+      const __bt$wrapped = () => {};
+      return __bt$wrapped(...__bt$args);
     };
   ` : `
-    const __apm$ctx = {
-      arguments,
-      self: this,
-      moduleVersion: ${JSON.stringify(moduleVersion)}
-    };
-    const __apm$traced = () => {
-      const __apm$wrapped = () => {};
-      return __apm$wrapped.apply(this, arguments);
+    const __bt$target = function (...__bt$args) {
+      const __bt$wrapped = () => {};
+      return __bt$wrapped.apply(this, __bt$args);
     };
   `
   ).body;
   block.body.unshift(...common);
-  esquery.query(block, "[id.name=__apm$wrapped]")[0].init = node;
+  esquery.query(block, "[id.name=__bt$wrapped]")[0].init = node;
   return block;
 }
 function wrapSuper(node) {
@@ -164,11 +180,11 @@ function wrapSuper(node) {
       const { name } = node2.property;
       let child;
       if (parent.callee) {
-        const { expression } = parse(`__apm$super['${name}'].call(this)`).body[0];
+        const { expression } = parse(`__bt$super['${name}'].call(this)`).body[0];
         parent.callee = child = expression.callee;
         parent.arguments.unshift(...expression.arguments);
       } else {
-        parent.expression = child = parse(`__apm$super['${name}']`).body[0];
+        parent.expression = child = parse(`__bt$super['${name}']`).body[0];
       }
       child.computed = parent.callee.computed;
       child.optional = parent.callee.optional;
@@ -179,151 +195,32 @@ function wrapSuper(node) {
     const member = parse(`
       class Wrapper {
         wrapper () {
-          __apm$super['${name}'] = super['${name}']
+          __bt$super['${name}'] = super['${name}']
         }
       }
     `).body[0].body.body[0].value.body.body[0];
     node.body.body.unshift(member);
   }
   if (members.size > 0) {
-    node.body.body.unshift(parse("const __apm$super = {}").body[0]);
+    node.body.body.unshift(parse("const __bt$super = {}").body[0]);
   }
 }
-function wrapCallback(state) {
-  const {
-    channelName,
-    functionQuery: { callbackIndex = -1 }
-  } = state;
-  const channelVariable = formatChannelVariable(channelName);
-  return parse(`
-    function wrapper () {
-      const __apm$cb = Array.prototype.at.call(arguments, ${callbackIndex});
-
-      if (!${channelVariable}.start.hasSubscribers) return __apm$traced();
-
-      function __apm$wrappedCb(err, res) {
-        if (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-        } else {
-          __apm$ctx.result = res;
-        }
-
-        ${channelVariable}.asyncStart.runStores(__apm$ctx, () => {
-          try {
-            if (__apm$cb) {
-              return __apm$cb.apply(this, arguments);
-            }
-          } finally {
-            ${channelVariable}.asyncEnd.publish(__apm$ctx);
-          }
-        });
-      }
-
-      if (typeof __apm$cb !== 'function') {
-        return __apm$traced();
-      }
-      Array.prototype.splice.call(arguments, ${callbackIndex}, 1, __apm$wrappedCb);
-
-      return ${channelVariable}.start.runStores(__apm$ctx, () => {
-        try {
-          return __apm$traced();
-        } catch (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-          throw err;
-        } finally {
-          __apm$ctx.self ??= this;
-          ${channelVariable}.end.publish(__apm$ctx);
-        }
-      });
-    }
-  `);
-}
-function wrapPromise(state) {
-  const { channelName } = state;
-  const channelVariable = formatChannelVariable(channelName);
+function wrapInvocation(state) {
+  const { channelName, moduleVersion, operator, functionQuery } = state;
+  const channelGetter = formatChannelGetter(channelName);
+  const callbackIndex = functionQuery.callbackIndex ?? -1;
   return parse(`
     function wrapper () {
-      if (!tr_ch_apm_hasSubscribers(${channelVariable})) return __apm$traced();
-
-      return ${channelVariable}.start.runStores(__apm$ctx, () => {
-        try {
-          let promise = __apm$traced();
-          if (typeof promise?.then !== 'function') {
-            __apm$ctx.result = promise;
-            return promise;
-          }
-          // Mirror Node.js core diagnostics_channel behaviour: for native Promise
-          // instances, chain normally (safe since there is no subclass API to
-          // preserve). For Promise subclasses and other thenables, side-chain the
-          // callbacks for event publishing and return the original so that any
-          // subclass-specific methods (e.g. APIPromise.withResponse()) remain
-          // accessible to the caller.
-          if (promise instanceof Promise && promise.constructor === Promise) {
-            return promise.then(
-              result => {
-                __apm$ctx.result = result;
-                ${channelVariable}.asyncStart.publish(__apm$ctx);
-                ${channelVariable}.asyncEnd.publish(__apm$ctx);
-                return result;
-              },
-              err => {
-                __apm$ctx.error = err;
-                ${channelVariable}.error.publish(__apm$ctx);
-                ${channelVariable}.asyncStart.publish(__apm$ctx);
-                ${channelVariable}.asyncEnd.publish(__apm$ctx);
-                throw err;
-              }
-            );
-          }
-          promise.then(
-            result => {
-              __apm$ctx.result = result;
-              ${channelVariable}.asyncStart.publish(__apm$ctx);
-              ${channelVariable}.asyncEnd.publish(__apm$ctx);
-            },
-            err => {
-              __apm$ctx.error = err;
-              ${channelVariable}.error.publish(__apm$ctx);
-              ${channelVariable}.asyncStart.publish(__apm$ctx);
-              ${channelVariable}.asyncEnd.publish(__apm$ctx);
-            }
-          );
-          return promise;
-        } catch (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-          throw err;
-        } finally {
-          __apm$ctx.self ??= this;
-          ${channelVariable}.end.publish(__apm$ctx);
-        }
-      });
-    }
-  `);
-}
-function wrapSync(state) {
-  const { channelName } = state;
-  const channelVariable = formatChannelVariable(channelName);
-  return parse(`
-    function wrapper () {
-      if (!tr_ch_apm_hasSubscribers(${channelVariable})) return __apm$traced();
-
-      return ${channelVariable}.start.runStores(__apm$ctx, () => {
-        try {
-          const result = __apm$traced();
-          __apm$ctx.result = result;
-          return result;
-        } catch (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-          throw err;
-        } finally {
-         __apm$ctx.self ??= this;
-          ${channelVariable}.end.publish(__apm$ctx);
-        }
-      });
+      const __bt$hook = ${channelGetter}();
+      if (!__bt$hook) return __bt$target.apply(this, arguments);
+      return __bt$hook.traceInvocation(
+        ${JSON.stringify(operator)},
+        __bt$target,
+        this,
+        arguments,
+        { moduleVersion: ${JSON.stringify(moduleVersion)} },
+        ${callbackIndex}
+      );
     }
   `);
 }
@@ -334,16 +231,14 @@ var Transformer = class {
   version;
   filePath;
   configs = [];
-  dcModule;
-  constructor(moduleName, version, filePath, configs, dcModule) {
+  constructor(moduleName, version, filePath, configs) {
     this.moduleName = moduleName;
     this.version = version;
     this.filePath = filePath;
     this.configs = configs;
-    this.dcModule = dcModule;
   }
   /**
-   * Instruments `code` by injecting diagnostics_channel tracing around the
+   * Instruments `code` by injecting global tracing hooks around the
    * target functions defined by this transformer's configs.
    */
   transform(code, moduleType) {
@@ -381,8 +276,6 @@ var Transformer = class {
       const query = astQuery || this.fromFunctionQuery(resolvedFunctionQuery);
       const state = {
         ...config,
-        dcModule: this.dcModule,
-        moduleType,
         moduleVersion: this.version,
         functionQuery: resolvedFunctionQuery,
         operator: this.getOperator(resolvedFunctionQuery.kind)
@@ -532,11 +425,9 @@ var Transformer = class {
 // src/auto-instrumentations/orchestrion-js/matcher.ts
 var InstrumentationMatcher = class {
   configs = [];
-  dcModule;
   transformers = {};
-  constructor(configs, dcModule) {
+  constructor(configs) {
     this.configs = configs;
-    this.dcModule = dcModule || "diagnostics_channel";
   }
   /**
    * Returns a Transformer for the given module/file/version, or undefined if no
@@ -558,8 +449,7 @@ var InstrumentationMatcher = class {
       moduleName,
       version,
       filePath,
-      configs,
-      this.dcModule
+      configs
     );
     return this.transformers[id];
   }
@@ -569,8 +459,8 @@ var InstrumentationMatcher = class {
 };
 
 // src/auto-instrumentations/orchestrion-js/index.ts
-function create(configs, dcModule) {
-  return new InstrumentationMatcher(configs, dcModule);
+function create(configs) {
+  return new InstrumentationMatcher(configs);
 }
 
 // src/auto-instrumentations/loader/mastra-observability-patch.ts
@@ -768,6 +658,9 @@ function applySpecialCasePatch(input) {
   if (input.packageName === "openai" && input.modulePath.includes("api-promise")) {
     return input.source + OPENAI_API_PROMISE_PATCH;
   }
+  if (input.browser) {
+    return null;
+  }
   const mastraTarget = classifyMastraTarget(
     input.packageName,
     input.modulePath