braintrust 3.7.1 → 3.9.0

package/dist/auto-instrumentations/index.d.mts

@@ -66,6 +66,27 @@ declare const claudeAgentSDKConfigs: InstrumentationConfig[];
  */
 declare const googleGenAIConfigs: InstrumentationConfig[];
 
+declare const huggingFaceConfigs: InstrumentationConfig[];
+
+declare const openRouterAgentConfigs: InstrumentationConfig[];
+
 declare const openRouterConfigs: InstrumentationConfig[];
 
-export { aiSDKConfigs, anthropicConfigs, claudeAgentSDKConfigs, googleGenAIConfigs, openRouterConfigs, openaiConfigs };
+declare const mistralConfigs: InstrumentationConfig[];
+
+/**
+ * Instrumentation configurations for the Google ADK (@google/adk).
+ *
+ * Runner.runAsync and BaseAgent.runAsync are async generators (`async *`).
+ * They synchronously return an AsyncGenerator object, so we use kind "Sync"
+ * paired with "sync-stream" channels — the same pattern used by the
+ * Claude Agent SDK's `query` function.
+ *
+ * FunctionTool.runAsync is a regular async method (returns Promise<unknown>)
+ * and uses kind "Async".
+ */
+declare const googleADKConfigs: InstrumentationConfig[];
+
+declare const cohereConfigs: InstrumentationConfig[];
+
+export { aiSDKConfigs, anthropicConfigs, claudeAgentSDKConfigs, cohereConfigs, googleADKConfigs, googleGenAIConfigs, huggingFaceConfigs, mistralConfigs, openRouterAgentConfigs, openRouterConfigs, openaiConfigs };

package/dist/auto-instrumentations/index.d.ts

@@ -66,6 +66,27 @@ declare const claudeAgentSDKConfigs: InstrumentationConfig[];
  */
 declare const googleGenAIConfigs: InstrumentationConfig[];
 
+declare const huggingFaceConfigs: InstrumentationConfig[];
+
+declare const openRouterAgentConfigs: InstrumentationConfig[];
+
 declare const openRouterConfigs: InstrumentationConfig[];
 
-export { aiSDKConfigs, anthropicConfigs, claudeAgentSDKConfigs, googleGenAIConfigs, openRouterConfigs, openaiConfigs };
+declare const mistralConfigs: InstrumentationConfig[];
+
+/**
+ * Instrumentation configurations for the Google ADK (@google/adk).
+ *
+ * Runner.runAsync and BaseAgent.runAsync are async generators (`async *`).
+ * They synchronously return an AsyncGenerator object, so we use kind "Sync"
+ * paired with "sync-stream" channels — the same pattern used by the
+ * Claude Agent SDK's `query` function.
+ *
+ * FunctionTool.runAsync is a regular async method (returns Promise<unknown>)
+ * and uses kind "Async".
+ */
+declare const googleADKConfigs: InstrumentationConfig[];
+
+declare const cohereConfigs: InstrumentationConfig[];
+
+export { aiSDKConfigs, anthropicConfigs, claudeAgentSDKConfigs, cohereConfigs, googleADKConfigs, googleGenAIConfigs, huggingFaceConfigs, mistralConfigs, openRouterAgentConfigs, openRouterConfigs, openaiConfigs };

package/dist/auto-instrumentations/index.mjs

@@ -1,16 +1,187 @@
 import {
   aiSDKConfigs,
   anthropicConfigs,
+  channel,
   claudeAgentSDKConfigs,
+  cohereConfigs,
+  defineChannels,
   googleGenAIConfigs,
+  huggingFaceConfigs,
+  mistralConfigs,
+  openRouterAgentConfigs,
   openRouterConfigs,
   openaiConfigs
-} from "./chunk-YCKND42U.mjs";
+} from "./chunk-KIMMUFAK.mjs";
+
+// src/instrumentation/plugins/google-adk-channels.ts
+var googleADKChannels = defineChannels("@google/adk", {
+  runnerRunAsync: channel({
+    channelName: "runner.runAsync",
+    kind: "sync-stream"
+  }),
+  agentRunAsync: channel({
+    channelName: "agent.runAsync",
+    kind: "sync-stream"
+  }),
+  toolRunAsync: channel({
+    channelName: "tool.runAsync",
+    kind: "async"
+  })
+});
+
+// src/auto-instrumentations/configs/google-adk.ts
+var googleADKVersionRange = ">=0.1.0";
+var googleADKBundledIndexVersionRange = ">=0.6.1 <0.7.0";
+var googleADKConfigs = [
+  // --- Runner.runAsync --- async generator, kind "Sync" + sync-stream channel
+  // Runner.runAsync — ESM individual module file
+  {
+    channelName: googleADKChannels.runnerRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKVersionRange,
+      filePath: "dist/esm/runner/runner.js"
+    },
+    functionQuery: {
+      className: "Runner",
+      methodName: "runAsync",
+      kind: "Sync"
+    }
+  },
+  // Runner.runAsync — bundled CJS/ESM indexes
+  // The bundled entrypoints minify class names, so target the 12th sync
+  // `runAsync` method in file order rather than a class name. This mapping is
+  // only validated against the current 0.6.x bundle layout, so keep the range
+  // tight until we verify newer bundled outputs.
+  {
+    channelName: googleADKChannels.runnerRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/cjs/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Sync",
+      index: 11
+    }
+  },
+  {
+    channelName: googleADKChannels.runnerRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/esm/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Sync",
+      index: 11
+    }
+  },
+  // --- BaseAgent.runAsync --- async generator, kind "Sync" + sync-stream channel
+  // BaseAgent.runAsync — ESM individual module file
+  {
+    channelName: googleADKChannels.agentRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKVersionRange,
+      filePath: "dist/esm/agents/base_agent.js"
+    },
+    functionQuery: {
+      className: "BaseAgent",
+      methodName: "runAsync",
+      kind: "Sync"
+    }
+  },
+  // BaseAgent.runAsync — bundled CJS/ESM indexes
+  // The bundled entrypoints minify class names, so target the first sync
+  // `runAsync` method in file order rather than a class name. This mapping is
+  // only validated against the current 0.6.x bundle layout, so keep the range
+  // tight until we verify newer bundled outputs.
+  {
+    channelName: googleADKChannels.agentRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/cjs/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Sync",
+      index: 0
+    }
+  },
+  {
+    channelName: googleADKChannels.agentRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/esm/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Sync",
+      index: 0
+    }
+  },
+  // --- FunctionTool.runAsync --- regular async, kind "Async"
+  // FunctionTool.runAsync — ESM individual module file
+  {
+    channelName: googleADKChannels.toolRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKVersionRange,
+      filePath: "dist/esm/tools/function_tool.js"
+    },
+    functionQuery: {
+      className: "FunctionTool",
+      methodName: "runAsync",
+      kind: "Async"
+    }
+  },
+  // FunctionTool.runAsync — bundled CJS/ESM indexes
+  // The bundled entrypoints minify class names, so target the first async
+  // `runAsync` method in file order rather than a class name. This mapping is
+  // only validated against the current 0.6.x bundle layout, so keep the range
+  // tight until we verify newer bundled outputs.
+  {
+    channelName: googleADKChannels.toolRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/cjs/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Async",
+      index: 1
+    }
+  },
+  {
+    channelName: googleADKChannels.toolRunAsync.channelName,
+    module: {
+      name: "@google/adk",
+      versionRange: googleADKBundledIndexVersionRange,
+      filePath: "dist/esm/index.js"
+    },
+    functionQuery: {
+      methodName: "runAsync",
+      kind: "Async",
+      index: 1
+    }
+  }
+];
 export {
   aiSDKConfigs,
   anthropicConfigs,
   claudeAgentSDKConfigs,
+  cohereConfigs,
+  googleADKConfigs,
   googleGenAIConfigs,
+  huggingFaceConfigs,
+  mistralConfigs,
+  openRouterAgentConfigs,
   openRouterConfigs,
   openaiConfigs
 };

package/dist/auto-instrumentations/loader/cjs-patch.cjs

@@ -34,7 +34,7 @@ __export(cjs_patch_exports, {
 });
 module.exports = __toCommonJS(cjs_patch_exports);
 var import_code_transformer = require("@apm-js-collab/code-transformer");
-var Module = __toESM(require("module"));
+var NodeModule = __toESM(require("module"));
 var import_node_path2 = require("path");
 var import_module_details_from_path = __toESM(require("module-details-from-path"));
 
@@ -52,11 +52,29 @@ function readPackageJson(baseDir) {
     return void 0;
   }
 }
+function resolvePackageBaseDir(baseDir) {
+  try {
+    return (0, import_node_fs.realpathSync)(baseDir);
+  } catch {
+    return baseDir;
+  }
+}
+function readPackageJsonWithFallback(baseDir) {
+  const packageJson = readPackageJson(baseDir);
+  if (packageJson) {
+    return packageJson;
+  }
+  const resolvedBaseDir = resolvePackageBaseDir(baseDir);
+  if (resolvedBaseDir === baseDir) {
+    return void 0;
+  }
+  return readPackageJson(resolvedBaseDir);
+}
 function getPackageVersion(baseDir) {
   if (packageVersions.has(baseDir)) {
     return packageVersions.get(baseDir);
   }
-  const packageJson = readPackageJson(baseDir);
+  const packageJson = readPackageJsonWithFallback(baseDir);
   if (typeof packageJson?.version === "string") {
     packageVersions.set(baseDir, packageJson.version);
     return packageJson.version;
@@ -67,7 +85,7 @@ function getPackageName(baseDir) {
   if (packageNames.has(baseDir)) {
     return packageNames.get(baseDir);
   }
-  const packageJson = readPackageJson(baseDir);
+  const packageJson = readPackageJsonWithFallback(baseDir);
   if (typeof packageJson?.name === "string") {
     packageNames.set(baseDir, packageJson.name);
     return packageJson.name;
@@ -79,13 +97,16 @@ function getPackageName(baseDir) {
 var ModulePatch = class {
   packages;
   instrumentator;
+  modulePrototype;
   originalCompile;
   constructor({
     instrumentations = []
   } = {}) {
+    const modulePrototype = resolveModulePrototype();
     this.packages = new Set(instrumentations.map((i) => i.module.name));
     this.instrumentator = (0, import_code_transformer.create)(instrumentations);
-    this.originalCompile = Module.prototype._compile;
+    this.modulePrototype = modulePrototype;
+    this.originalCompile = modulePrototype._compile;
   }
   /**
    * Patches the Node.js module class method that is responsible for compiling code.
@@ -94,7 +115,7 @@ var ModulePatch = class {
    */
   patch() {
     const self = this;
-    Module.prototype._compile = function wrappedCompile(...args) {
+    this.modulePrototype._compile = function wrappedCompile(...args) {
       const [content, filename] = args;
       const normalizedForPlatform = filename.split("/").join(import_node_path2.sep);
       const resolvedModule = (0, import_module_details_from_path.default)(normalizedForPlatform);
@@ -129,9 +150,16 @@ var ModulePatch = class {
    * **Note**: This is intended to be used in testing only.
    */
   unpatch() {
-    Module.prototype._compile = this.originalCompile;
+    this.modulePrototype._compile = this.originalCompile;
   }
 };
+function resolveModulePrototype() {
+  const moduleCtor = NodeModule.Module;
+  if (moduleCtor && typeof moduleCtor === "function") {
+    return moduleCtor.prototype;
+  }
+  return NodeModule.prototype;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ModulePatch

package/dist/auto-instrumentations/loader/cjs-patch.d.mts

@@ -8,6 +8,7 @@ import { InstrumentationConfig } from '@apm-js-collab/code-transformer';
 declare class ModulePatch {
     private packages;
     private instrumentator;
+    private modulePrototype;
     private originalCompile;
     constructor({ instrumentations, }?: {
         instrumentations?: InstrumentationConfig[];

package/dist/auto-instrumentations/loader/cjs-patch.d.ts

@@ -8,6 +8,7 @@ import { InstrumentationConfig } from '@apm-js-collab/code-transformer';
 declare class ModulePatch {
     private packages;
     private instrumentator;
+    private modulePrototype;
     private originalCompile;
     constructor({ instrumentations, }?: {
         instrumentations?: InstrumentationConfig[];

package/dist/auto-instrumentations/loader/cjs-patch.mjs

@@ -1,25 +1,28 @@
 import {
   getPackageName,
   getPackageVersion
-} from "../chunk-VLEJ5AEK.mjs";
+} from "../chunk-P5YLNB2A.mjs";
 
 // src/auto-instrumentations/loader/cjs-patch.ts
 import {
   create
 } from "@apm-js-collab/code-transformer";
-import * as Module from "module";
+import * as NodeModule from "module";
 import { sep } from "path";
 import moduleDetailsFromPath from "module-details-from-path";
 var ModulePatch = class {
   packages;
   instrumentator;
+  modulePrototype;
   originalCompile;
   constructor({
     instrumentations = []
   } = {}) {
+    const modulePrototype = resolveModulePrototype();
     this.packages = new Set(instrumentations.map((i) => i.module.name));
     this.instrumentator = create(instrumentations);
-    this.originalCompile = Module.prototype._compile;
+    this.modulePrototype = modulePrototype;
+    this.originalCompile = modulePrototype._compile;
   }
   /**
    * Patches the Node.js module class method that is responsible for compiling code.
@@ -28,7 +31,7 @@ var ModulePatch = class {
    */
   patch() {
     const self = this;
-    Module.prototype._compile = function wrappedCompile(...args) {
+    this.modulePrototype._compile = function wrappedCompile(...args) {
       const [content, filename] = args;
       const normalizedForPlatform = filename.split("/").join(sep);
       const resolvedModule = moduleDetailsFromPath(normalizedForPlatform);
@@ -63,9 +66,16 @@ var ModulePatch = class {
    * **Note**: This is intended to be used in testing only.
    */
   unpatch() {
-    Module.prototype._compile = this.originalCompile;
+    this.modulePrototype._compile = this.originalCompile;
   }
 };
+function resolveModulePrototype() {
+  const moduleCtor = NodeModule.Module;
+  if (moduleCtor && typeof moduleCtor === "function") {
+    return moduleCtor.prototype;
+  }
+  return NodeModule.prototype;
+}
 export {
   ModulePatch
 };

package/dist/auto-instrumentations/loader/esm-hook.mjs

@@ -1,6 +1,7 @@
 import {
+  getPackageName,
   getPackageVersion
-} from "../chunk-EVUKFMHG.mjs";
+} from "../chunk-ITP7RAUY.mjs";
 
 // src/auto-instrumentations/loader/esm-hook.mts
 import { readFile } from "fs/promises";
@@ -23,11 +24,15 @@ async function resolve(specifier, context, nextResolve) {
   const filePath = url.url.startsWith("file:") ? fileURLToPath(url.url) : url.url;
   const normalizedForPlatform = filePath.split("/").join(sep);
   const resolvedModule = moduleDetailsFromPath(normalizedForPlatform);
-  if (resolvedModule && packages?.has(resolvedModule.name)) {
+  if (resolvedModule) {
+    const packageName = getPackageName(resolvedModule.basedir) ?? resolvedModule.name;
+    if (!packages?.has(packageName)) {
+      return url;
+    }
     const version = getPackageVersion(resolvedModule.basedir);
     const normalizedModulePath = resolvedModule.path.replace(/\\/g, "/");
     const transformer = instrumentator.getTransformer(
-      resolvedModule.name,
+      packageName,
       version,
       normalizedModulePath
     );
@@ -50,9 +55,10 @@ async function load(url, context, nextLoad) {
   if (code) {
     const transformer = transformers.get(url);
     try {
+      const moduleType = result.format === "module" ? "esm" : result.format === "commonjs" ? "cjs" : "unknown";
       const transformedCode = transformer.transform(
         code.toString("utf8"),
-        "unknown"
+        moduleType
       );
       result.source = transformedCode?.code;
       result.shortCircuit = true;

package/dist/auto-instrumentations/loader/get-package-version.cjs

@@ -37,11 +37,29 @@ function readPackageJson(baseDir) {
     return void 0;
   }
 }
+function resolvePackageBaseDir(baseDir) {
+  try {
+    return (0, import_node_fs.realpathSync)(baseDir);
+  } catch {
+    return baseDir;
+  }
+}
+function readPackageJsonWithFallback(baseDir) {
+  const packageJson = readPackageJson(baseDir);
+  if (packageJson) {
+    return packageJson;
+  }
+  const resolvedBaseDir = resolvePackageBaseDir(baseDir);
+  if (resolvedBaseDir === baseDir) {
+    return void 0;
+  }
+  return readPackageJson(resolvedBaseDir);
+}
 function getPackageVersion(baseDir) {
   if (packageVersions.has(baseDir)) {
     return packageVersions.get(baseDir);
   }
-  const packageJson = readPackageJson(baseDir);
+  const packageJson = readPackageJsonWithFallback(baseDir);
   if (typeof packageJson?.version === "string") {
     packageVersions.set(baseDir, packageJson.version);
     return packageJson.version;
@@ -52,7 +70,7 @@ function getPackageName(baseDir) {
   if (packageNames.has(baseDir)) {
     return packageNames.get(baseDir);
   }
-  const packageJson = readPackageJson(baseDir);
+  const packageJson = readPackageJsonWithFallback(baseDir);
   if (typeof packageJson?.name === "string") {
     packageNames.set(baseDir, packageJson.name);
     return packageJson.name;

package/dist/auto-instrumentations/loader/get-package-version.mjs

@@ -1,7 +1,7 @@
 import {
   getPackageName,
   getPackageVersion
-} from "../chunk-VLEJ5AEK.mjs";
+} from "../chunk-P5YLNB2A.mjs";
 export {
   getPackageName,
   getPackageVersion