@fallom/trace 0.2.24 → 0.2.26

package/dist/index.mjs

@@ -23,7 +23,7 @@ import {
   isCustomMetric,
   runGEval,
   uploadResultsPublic
-} from "./chunk-3VWF2OJX.mjs";
+} from "./chunk-FTZVXPQN.mjs";
 import {
   __export
 } from "./chunk-7P6ASYW6.mjs";
@@ -45,7 +45,7 @@ import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 // node_modules/@opentelemetry/resources/build/esm/Resource.js
 import { diag } from "@opentelemetry/api";
 
-// node_modules/@opentelemetry/resources/node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js
+// node_modules/@opentelemetry/semantic-conventions/build/esm/resource/SemanticResourceAttributes.js
 var SemanticResourceAttributes = {
   /**
    * Name of the cloud provider.
@@ -1492,6 +1492,101 @@ function wrapGoogleAI(model, sessionCtx) {
   return model;
 }
 
+// src/trace/wrappers/vercel-ai/utils.ts
+function extractProviderInfo(model, aiModule, result) {
+  const info = {};
+  try {
+    if (aiModule) {
+      info.aiSdkVersion = aiModule.version ?? aiModule.VERSION ?? void 0;
+    }
+    if (!model) return info;
+    info.modelId = model.modelId ?? model.id ?? String(model);
+    if (model.provider) {
+      if (typeof model.provider === "string") {
+        info.provider = model.provider;
+      } else if (typeof model.provider === "object") {
+        info.provider = model.provider.id ?? model.provider.name;
+        info.providerId = model.provider.id;
+      }
+    }
+    if (model.providerId) {
+      info.providerId = model.providerId;
+    }
+    const baseUrl3 = model.config?.baseURL ?? model.config?.baseUrl ?? model.settings?.baseURL ?? model.settings?.baseUrl ?? model.baseURL ?? model.baseUrl;
+    if (baseUrl3 && typeof baseUrl3 === "string") {
+      info.baseUrl = baseUrl3;
+      if (!info.provider) {
+        if (baseUrl3.includes("openrouter.ai")) {
+          info.provider = "openrouter";
+        } else if (baseUrl3.includes("api.openai.com")) {
+          info.provider = "openai";
+        } else if (baseUrl3.includes("api.anthropic.com")) {
+          info.provider = "anthropic";
+        } else if (baseUrl3.includes("generativelanguage.googleapis.com")) {
+          info.provider = "google";
+        } else if (baseUrl3.includes("api.mistral.ai")) {
+          info.provider = "mistral";
+        } else if (baseUrl3.includes("api.together.xyz")) {
+          info.provider = "together";
+        } else if (baseUrl3.includes("api.groq.com")) {
+          info.provider = "groq";
+        } else if (baseUrl3.includes("localhost") || baseUrl3.includes("127.0.0.1")) {
+          info.provider = "local";
+        }
+      }
+    }
+    if (!info.provider && info.modelId) {
+      const modelStr = String(info.modelId).toLowerCase();
+      if (modelStr.includes("gpt-") || modelStr.includes("o1-") || modelStr.includes("text-embedding")) {
+        info.provider = info.provider ?? "openai";
+      } else if (modelStr.includes("claude-")) {
+        info.provider = info.provider ?? "anthropic";
+      } else if (modelStr.includes("gemini-") || modelStr.includes("gemma-")) {
+        info.provider = info.provider ?? "google";
+      } else if (modelStr.includes("mistral-") || modelStr.includes("mixtral-")) {
+        info.provider = info.provider ?? "mistral";
+      } else if (modelStr.includes("llama-") || modelStr.includes("meta-llama")) {
+        info.provider = info.provider ?? "meta";
+      } else if (modelStr.includes("/")) {
+        info.provider = info.provider ?? "openrouter";
+      }
+    }
+    if (result?.response) {
+      if (!info.modelId && result.response.modelId) {
+        info.modelId = result.response.modelId;
+      }
+    }
+    info.raw = {};
+    if (model.modelId) info.raw.modelId = model.modelId;
+    if (model.provider) {
+      info.raw.provider = typeof model.provider === "object" ? { id: model.provider.id, name: model.provider.name } : model.provider;
+    }
+    if (model.providerId) info.raw.providerId = model.providerId;
+    if (model.specificationVersion) info.raw.specificationVersion = model.specificationVersion;
+  } catch {
+  }
+  return info;
+}
+function providerInfoToAttributes(info) {
+  const attrs = {};
+  if (info.provider) {
+    attrs["fallom.provider"] = info.provider;
+  }
+  if (info.providerId) {
+    attrs["fallom.provider_id"] = info.providerId;
+  }
+  if (info.baseUrl) {
+    attrs["fallom.base_url"] = info.baseUrl;
+  }
+  if (info.aiSdkVersion) {
+    attrs["fallom.ai_sdk_version"] = info.aiSdkVersion;
+  }
+  if (info.raw && Object.keys(info.raw).length > 0) {
+    attrs["fallom.provider_raw"] = JSON.stringify(info.raw);
+  }
+  return attrs;
+}
+
 // src/trace/wrappers/vercel-ai/generate-text.ts
 function createGenerateTextWrapper(aiModule, sessionCtx, debug = false) {
   const ctx = sessionCtx;
@@ -1515,34 +1610,44 @@ function createGenerateTextWrapper(aiModule, sessionCtx, debug = false) {
       )) {
         if (tool && typeof tool.execute === "function") {
           const originalExecute = tool.execute;
-          wrappedTools[toolName] = {
-            ...tool,
-            execute: async (...executeArgs) => {
-              const toolStartTime = Date.now();
-              const toolCallId = `${toolName}-${toolStartTime}`;
-              try {
-                const result = await originalExecute(...executeArgs);
-                const toolEndTime = Date.now();
-                toolTimings.set(toolCallId, {
-                  name: toolName,
-                  startTime: toolStartTime - startTime,
-                  // Relative to request start
-                  endTime: toolEndTime - startTime,
-                  duration: toolEndTime - toolStartTime
-                });
-                return result;
-              } catch (error) {
-                const toolEndTime = Date.now();
-                toolTimings.set(toolCallId, {
-                  name: toolName,
-                  startTime: toolStartTime - startTime,
-                  endTime: toolEndTime - startTime,
-                  duration: toolEndTime - toolStartTime
-                });
-                throw error;
-              }
+          const wrappedTool = Object.create(Object.getPrototypeOf(tool) || {});
+          const allKeys = [
+            ...Object.getOwnPropertyNames(tool),
+            ...Object.getOwnPropertySymbols(tool)
+          ];
+          for (const key of allKeys) {
+            if (key === "execute") continue;
+            const descriptor = Object.getOwnPropertyDescriptor(tool, key);
+            if (descriptor) {
+              Object.defineProperty(wrappedTool, key, descriptor);
+            }
+          }
+          wrappedTool.execute = async (...executeArgs) => {
+            const toolStartTime = Date.now();
+            const toolCallId = `${toolName}-${toolStartTime}`;
+            try {
+              const result = await originalExecute(...executeArgs);
+              const toolEndTime = Date.now();
+              toolTimings.set(toolCallId, {
+                name: toolName,
+                startTime: toolStartTime - startTime,
+                // Relative to request start
+                endTime: toolEndTime - startTime,
+                duration: toolEndTime - toolStartTime
+              });
+              return result;
+            } catch (error) {
+              const toolEndTime = Date.now();
+              toolTimings.set(toolCallId, {
+                name: toolName,
+                startTime: toolStartTime - startTime,
+                endTime: toolEndTime - startTime,
+                duration: toolEndTime - toolStartTime
+              });
+              throw error;
             }
           };
+          wrappedTools[toolName] = wrappedTool;
         } else {
           wrappedTools[toolName] = tool;
         }
@@ -1558,9 +1663,12 @@ function createGenerateTextWrapper(aiModule, sessionCtx, debug = false) {
         console.log("   steps:", result?.steps?.length || 0);
       }
       const modelId = result?.response?.modelId || params?.model?.modelId || String(params?.model || "unknown");
+      const providerInfo = extractProviderInfo(params?.model, aiModule, result);
       const attributes = {
         "fallom.sdk_version": "2",
-        "fallom.method": "generateText"
+        "fallom.method": "generateText",
+        // Provider info for debugging
+        ...providerInfoToAttributes(providerInfo)
       };
       if (captureContent2) {
         attributes["fallom.raw.request"] = JSON.stringify({
@@ -1574,7 +1682,17 @@ function createGenerateTextWrapper(aiModule, sessionCtx, debug = false) {
         const mapToolCall = (tc) => {
           let args2 = tc?.args ?? tc?.input;
           if (args2 === void 0 && tc) {
-            const { type, toolCallId, toolName, providerExecuted, dynamic, invalid, error, providerMetadata, ...rest } = tc;
+            const {
+              type,
+              toolCallId,
+              toolName,
+              providerExecuted,
+              dynamic,
+              invalid,
+              error,
+              providerMetadata,
+              ...rest
+            } = tc;
             if (Object.keys(rest).length > 0) {
               args2 = rest;
             }
@@ -1818,33 +1936,43 @@ function createStreamTextWrapper(aiModule, sessionCtx, debug = false) {
       )) {
         if (tool && typeof tool.execute === "function") {
           const originalExecute = tool.execute;
-          wrappedTools[toolName] = {
-            ...tool,
-            execute: async (...executeArgs) => {
-              const toolStartTime = Date.now();
-              const toolCallId = `${toolName}-${toolStartTime}`;
-              try {
-                const result2 = await originalExecute(...executeArgs);
-                const toolEndTime = Date.now();
-                toolTimings.set(toolCallId, {
-                  name: toolName,
-                  startTime: toolStartTime - startTime,
-                  endTime: toolEndTime - startTime,
-                  duration: toolEndTime - toolStartTime
-                });
-                return result2;
-              } catch (error) {
-                const toolEndTime = Date.now();
-                toolTimings.set(toolCallId, {
-                  name: toolName,
-                  startTime: toolStartTime - startTime,
-                  endTime: toolEndTime - startTime,
-                  duration: toolEndTime - toolStartTime
-                });
-                throw error;
-              }
+          const wrappedTool = Object.create(Object.getPrototypeOf(tool) || {});
+          const allKeys = [
+            ...Object.getOwnPropertyNames(tool),
+            ...Object.getOwnPropertySymbols(tool)
+          ];
+          for (const key of allKeys) {
+            if (key === "execute") continue;
+            const descriptor = Object.getOwnPropertyDescriptor(tool, key);
+            if (descriptor) {
+              Object.defineProperty(wrappedTool, key, descriptor);
+            }
+          }
+          wrappedTool.execute = async (...executeArgs) => {
+            const toolStartTime = Date.now();
+            const toolCallId = `${toolName}-${toolStartTime}`;
+            try {
+              const result2 = await originalExecute(...executeArgs);
+              const toolEndTime = Date.now();
+              toolTimings.set(toolCallId, {
+                name: toolName,
+                startTime: toolStartTime - startTime,
+                endTime: toolEndTime - startTime,
+                duration: toolEndTime - toolStartTime
+              });
+              return result2;
+            } catch (error) {
+              const toolEndTime = Date.now();
+              toolTimings.set(toolCallId, {
+                name: toolName,
+                startTime: toolStartTime - startTime,
+                endTime: toolEndTime - startTime,
+                duration: toolEndTime - toolStartTime
+              });
+              throw error;
             }
           };
+          wrappedTools[toolName] = wrappedTool;
         } else {
           wrappedTools[toolName] = tool;
         }
@@ -1955,10 +2083,13 @@ function createStreamTextWrapper(aiModule, sessionCtx, debug = false) {
               providerMetadata = void 0;
             }
           }
+          const providerInfo = extractProviderInfo(params?.model, aiModule, result);
           const attributes = {
             "fallom.sdk_version": "2",
             "fallom.method": "streamText",
-            "fallom.is_streaming": true
+            "fallom.is_streaming": true,
+            // Provider info for debugging
+            ...providerInfoToAttributes(providerInfo)
           };
           if (captureContent2) {
             const mapToolCall = (tc) => {
@@ -2229,9 +2360,12 @@ function createGenerateObjectWrapper(aiModule, sessionCtx, debug = false) {
         );
       }
       const modelId = result?.response?.modelId || params?.model?.modelId || String(params?.model || "unknown");
+      const providerInfo = extractProviderInfo(params?.model, aiModule, result);
       const attributes = {
         "fallom.sdk_version": "2",
-        "fallom.method": "generateObject"
+        "fallom.method": "generateObject",
+        // Provider info for debugging
+        ...providerInfoToAttributes(providerInfo)
       };
       if (captureContent2) {
         attributes["fallom.raw.request"] = JSON.stringify({
@@ -2354,10 +2488,13 @@ function createStreamObjectWrapper(aiModule, sessionCtx, debug = false) {
             providerMetadata = void 0;
           }
         }
+        const providerInfo = extractProviderInfo(params?.model, aiModule, result);
         const attributes = {
           "fallom.sdk_version": "2",
           "fallom.method": "streamObject",
-          "fallom.is_streaming": true
+          "fallom.is_streaming": true,
+          // Provider info for debugging
+          ...providerInfoToAttributes(providerInfo)
         };
         if (captureContent2) {
           attributes["fallom.raw.request"] = JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fallom/trace",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Model A/B testing and tracing for LLM applications. Zero latency, production-ready.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",