@raindrop-ai/ai-sdk 0.1.1 → 0.2.1

package/dist/index.browser.mjs

@@ -1,4 +1,4 @@
-// ../core/dist/chunk-Y5LUB7OE.js
+// ../core/dist/chunk-QNWZIOOY.js
 function normalizeFeatureFlags(input) {
   if (Array.isArray(input)) {
     return Object.fromEntries(input.map((name) => [name, "true"]));
@@ -441,19 +441,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const out = { ...target, ...source };
   if (target.properties || source.properties) {
     out.properties = { ...(_a = target.properties) != null ? _a : {}, ...(_b = source.properties) != null ? _b : {} };
   }
+  if (target.usage || source.usage) {
+    out.usage = { ...(_c = target.usage) != null ? _c : {} };
+    if (((_d = source.usage) == null ? void 0 : _d.promptTokens) !== void 0) {
+      out.usage.promptTokens = source.usage.promptTokens;
+    }
+    if (((_e = source.usage) == null ? void 0 : _e.completionTokens) !== void 0) {
+      out.usage.completionTokens = source.usage.completionTokens;
+    }
+  }
+  if (source.error === void 0) {
+    out.error = target.error;
+  }
   if (target.featureFlags || source.featureFlags) {
-    out.featureFlags = { ...(_c = target.featureFlags) != null ? _c : {}, ...(_d = source.featureFlags) != null ? _d : {} };
+    out.featureFlags = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
   }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_e = target.attachments) != null ? _e : [], ...(_f = source.attachments) != null ? _f : []];
+    out.attachments = [...(_h = target.attachments) != null ? _h : [], ...(_i = source.attachments) != null ? _i : []];
   }
   return out;
 }
+function isErrorLike(value) {
+  return value !== null && typeof value === "object";
+}
+function eventTelemetryProperties(patch) {
+  var _a, _b;
+  const properties = {};
+  if (((_a = patch.usage) == null ? void 0 : _a.promptTokens) !== void 0 && Number.isFinite(patch.usage.promptTokens)) {
+    properties["ai.usage.prompt_tokens"] = patch.usage.promptTokens;
+  }
+  if (((_b = patch.usage) == null ? void 0 : _b.completionTokens) !== void 0 && Number.isFinite(patch.usage.completionTokens)) {
+    properties["ai.usage.completion_tokens"] = patch.usage.completionTokens;
+  }
+  if (patch.error !== void 0 && patch.error !== null) {
+    const constructorName = patch.error instanceof Error && patch.error.constructor !== Error ? patch.error.constructor.name : void 0;
+    const errorType = patch.error instanceof Error ? patch.error.name && patch.error.name !== "Error" ? patch.error.name : constructorName || patch.error.name || "Error" : isErrorLike(patch.error) && typeof patch.error.name === "string" && patch.error.name.length > 0 ? patch.error.name : "Error";
+    const errorMessage = patch.error instanceof Error ? patch.error.message : isErrorLike(patch.error) && typeof patch.error.message === "string" ? patch.error.message : String(patch.error);
+    properties["error.type"] = errorType;
+    properties["error.message"] = errorMessage;
+  }
+  return properties;
+}
 var EventShipper = class {
   constructor(opts) {
     this.buffers = /* @__PURE__ */ new Map();
@@ -702,6 +735,11 @@ var EventShipper = class {
       return;
     }
     const { wizardSession, ...restProperties } = (_e = accumulated.properties) != null ? _e : {};
+    let telemetryProperties = {};
+    try {
+      telemetryProperties = eventTelemetryProperties(accumulated);
+    } catch (e) {
+    }
     const convoId = (_f = accumulated.convoId) != null ? _f : sticky.convoId;
     const isPending = (_h = (_g = accumulated.isPending) != null ? _g : sticky.isPending) != null ? _h : true;
     const payload = {
@@ -711,12 +749,13 @@ var EventShipper = class {
       timestamp: (_i = accumulated.timestamp) != null ? _i : (/* @__PURE__ */ new Date()).toISOString(),
       ai_data: {
         input: accumulated.input,
-        output: accumulated.output,
+        output: accumulated.error !== void 0 && accumulated.error !== null ? void 0 : accumulated.output,
         model: accumulated.model,
         convo_id: convoId
       },
       properties: {
         ...restProperties,
+        ...telemetryProperties,
         ...wizardSession ? { "raindrop.wizardSession": wizardSession } : {},
         $context: this.context
       },
@@ -785,6 +824,193 @@ var EventShipper = class {
     }
   }
 };
+var MODEL_USAGE_ATTRIBUTES = {
+  providerName: "gen_ai.provider.name",
+  requestModel: "gen_ai.request.model",
+  responseModel: "gen_ai.response.model",
+  inputTokens: "gen_ai.usage.input_tokens",
+  outputTokens: "gen_ai.usage.output_tokens",
+  reasoningTokens: "gen_ai.usage.reasoning_tokens",
+  cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
+  cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
+  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
+  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
+  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
+  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
+};
+var MODEL_PROVIDER_NAMES = [
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex"],
+  ["amazon-bedrock", "amazon-bedrock"],
+  ["bedrock", "amazon-bedrock"],
+  ["anthropic", "anthropic"],
+  ["openai", "openai"],
+  ["google", "google"],
+  ["azure", "azure"],
+  ["openrouter", "openrouter"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function exclusiveTokens({
+  explicit,
+  total,
+  parts,
+  semantics
+}) {
+  if (explicit !== void 0) return explicit;
+  if (total === void 0) return void 0;
+  if (semantics === "exclusive") return total;
+  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
+  if (semantics === void 0 && observedParts.length > 0) return void 0;
+  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
+  return exclusive >= 0 ? exclusive : void 0;
+}
+function buildModelUsageAttributes(usage) {
+  const inputTokens = tokenCount(usage.inputTokens);
+  const outputTokens = tokenCount(usage.outputTokens);
+  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
+  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
+  const reasoningTokens = tokenCount(usage.reasoningTokens);
+  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
+  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
+  const nonCachedInputTokens = exclusiveTokens({
+    explicit: explicitNonCachedInputTokens,
+    total: inputTokens,
+    parts: [cacheReadInputTokens, cacheWriteInputTokens],
+    semantics: usage.inputTokenSemantics
+  });
+  const nonReasoningOutputTokens = exclusiveTokens({
+    explicit: explicitNonReasoningOutputTokens,
+    total: outputTokens,
+    parts: [reasoningTokens],
+    semantics: usage.outputTokenSemantics
+  });
+  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
+    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
+  ] : [];
+  return [
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
+    ...exclusivePoolAttributes
+  ].filter((attribute) => attribute !== void 0);
+}
+var STRING_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
+};
+var NUMBER_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.inputTokens]: [
+    "gen_ai.usage.prompt_tokens",
+    "ai.usage.prompt_tokens",
+    "ai.usage.promptTokens",
+    "ai.usage.input_tokens",
+    "ai.usage.inputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.outputTokens]: [
+    "gen_ai.usage.completion_tokens",
+    "ai.usage.completion_tokens",
+    "ai.usage.completionTokens",
+    "ai.usage.output_tokens",
+    "ai.usage.outputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.reasoningTokens]: [
+    "gen_ai.usage.reasoning.output_tokens",
+    "ai.usage.reasoningTokens",
+    "ai.usage.thoughts_tokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens]: [
+    "gen_ai.usage.cache_read_tokens",
+    "gen_ai.usage.cache_read.input_tokens",
+    "ai.usage.cachedInputTokens",
+    "ai.usage.cached_tokens",
+    "ai.usage.cache_read_tokens",
+    "ai.usage.cache_read_input_tokens",
+    "ai.usage.cacheReadInputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens]: [
+    "gen_ai.usage.cache_creation_input_tokens",
+    "gen_ai.usage.cache_creation.input_tokens",
+    "ai.usage.cacheWriteInputTokens",
+    "ai.usage.cache_creation_input_tokens",
+    "ai.usage.cacheCreationInputTokens"
+  ]
+};
+function hasAttribute(attributes, key) {
+  return attributes.some((attribute) => attribute.key === key);
+}
+function findStringAttribute(attributes, keys) {
+  return attributes.find(
+    (attribute) => keys.includes(attribute.key) && typeof attribute.value.stringValue === "string" && attribute.value.stringValue.length > 0
+  );
+}
+function findNumberAttribute(attributes, keys) {
+  return attributes.find((attribute) => {
+    if (!keys.includes(attribute.key)) return false;
+    if (typeof attribute.value.doubleValue === "number" && Number.isSafeInteger(attribute.value.doubleValue) && attribute.value.doubleValue >= 0) {
+      return true;
+    }
+    const intValue = attribute.value.intValue;
+    return integerValue(intValue) !== void 0;
+  });
+}
+function integerValue(value) {
+  if (typeof value === "number") {
+    return Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+  }
+  if (typeof value !== "string") return void 0;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function appendAlias(attributes, target, source) {
+  if (!source || hasAttribute(attributes, target)) return attributes;
+  return [...attributes, { key: target, value: { ...source.value } }];
+}
+function appendProviderAlias(attributes) {
+  if (hasAttribute(attributes, MODEL_USAGE_ATTRIBUTES.providerName)) return attributes;
+  const source = findStringAttribute(attributes, ["gen_ai.system", "ai.model.provider"]);
+  if (!(source == null ? void 0 : source.value.stringValue)) return attributes;
+  const attribute = attrString(
+    MODEL_USAGE_ATTRIBUTES.providerName,
+    canonicalModelProvider(source.value.stringValue)
+  );
+  return attribute ? [...attributes, attribute] : attributes;
+}
+function normalizeModelUsageSpan(span) {
+  const original = span.attributes;
+  if (!original || original.length === 0) return span;
+  const responseModel = findStringAttribute(original, [
+    MODEL_USAGE_ATTRIBUTES.responseModel,
+    "ai.response.model"
+  ]);
+  if (!responseModel) return span;
+  let attributes = appendAlias(original, MODEL_USAGE_ATTRIBUTES.responseModel, responseModel);
+  attributes = appendProviderAlias(attributes);
+  for (const [target, aliases] of Object.entries(STRING_ALIASES)) {
+    attributes = appendAlias(attributes, target, findStringAttribute(attributes, aliases));
+  }
+  for (const [target, aliases] of Object.entries(NUMBER_ALIASES)) {
+    attributes = appendAlias(attributes, target, findNumberAttribute(attributes, aliases));
+  }
+  return attributes === original ? span : { ...span, attributes };
+}
 var DEFAULT_SECRET_KEY_NAMES = [
   "apikey",
   "apisecret",
@@ -874,6 +1100,13 @@ function redactJsonAttributeValue(key, value) {
   if (scrubbedJson === json) return void 0;
   return { stringValue: scrubbedJson };
 }
+function identityAttrs(args) {
+  return [
+    attrString("ai.telemetry.metadata.raindrop.ai.userId", args.userId),
+    attrString("ai.telemetry.metadata.raindrop.convoId", args.convoId),
+    attrString("ai.telemetry.metadata.raindrop.eventName", args.eventName)
+  ];
+}
 function applyOtelSpanAttributeLimit(limit) {
   var _a, _b;
   try {
@@ -978,6 +1211,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -998,6 +1235,7 @@ var TraceShipper = class {
     const started = (_a = args.startTimeUnixNano) != null ? _a : nowUnixNanoString();
     const attrs = [
       attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args),
       attrString("ai.operationId", args.operationId)
     ];
     if ((_b = args.attributes) == null ? void 0 : _b.length) attrs.push(...args.attributes);
@@ -1053,7 +1291,8 @@ var TraceShipper = class {
     var _a;
     const ids = createSpanIds(args.parent);
     const attrs = [
-      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId)
+      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args)
     ];
     if ((_a = args.attributes) == null ? void 0 : _a.length) attrs.push(...args.attributes);
     const otlp = buildOtlpSpan({
@@ -1309,7 +1548,7 @@ async function* asyncGeneratorWithCurrent(span, gen) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/ai-sdk",
-  version: "0.1.1"};
+  version: "0.2.1"};
 
 // src/internal/version.ts
 var libraryName = package_default.name;
@@ -2006,6 +2245,15 @@ function attrsFromHeaders(headers) {
   if (!isRecord(headers)) return [];
   return Object.entries(headers).filter(([, v]) => typeof v === "string").map(([k, v]) => attrString(`ai.request.headers.${k}`, v));
 }
+function attrsFromModelProvider(provider) {
+  if (typeof provider !== "string" || provider.length === 0) return [];
+  const providerName = canonicalModelProvider(provider);
+  return [
+    attrString("ai.model.provider", provider),
+    attrString(MODEL_USAGE_ATTRIBUTES.providerName, providerName),
+    attrString("gen_ai.system", provider)
+  ];
+}
 function attrsFromSettings(args) {
   if (!isRecord(args)) return [];
   const result = [];
@@ -2188,6 +2436,126 @@ function runWithParentToolContext(ctx, fn) {
   return getStorage2().run(ctx, fn);
 }
 
+// src/internal/usage.ts
+function firstTokenCount(...values) {
+  for (const value of values) {
+    if (typeof value === "number" && Number.isSafeInteger(value) && value >= 0) {
+      return value;
+    }
+  }
+  return void 0;
+}
+function flatUsageSemantics(provider) {
+  const normalizedProvider = typeof provider === "string" ? provider.trim().toLowerCase() : void 0;
+  if (normalizedProvider === "anthropic" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("anthropic.")) || normalizedProvider === "vertex.anthropic" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("vertex.anthropic."))) {
+    return {
+      inputTokenSemantics: "exclusive",
+      outputTokenSemantics: "total"
+    };
+  }
+  if (normalizedProvider === "openai" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("openai.")) || normalizedProvider === "azure" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("azure."))) {
+    return {
+      inputTokenSemantics: "total",
+      outputTokenSemantics: "total"
+    };
+  }
+  if (normalizedProvider === "google" || (normalizedProvider == null ? void 0 : normalizedProvider.startsWith("google."))) {
+    return {
+      inputTokenSemantics: "total",
+      // Google v5 reports candidate output and thoughts separately.
+      outputTokenSemantics: "exclusive"
+    };
+  }
+  return {};
+}
+var CACHE_WRITE_METADATA_KEYS = [
+  ["anthropic", "cacheCreationInputTokens"],
+  ["openai", "cacheWriteTokens"],
+  ["bedrock", "cacheWriteInputTokens"]
+];
+function cacheWriteTokensFromProviderMetadata(providerMetadata) {
+  if (!isRecord(providerMetadata)) return void 0;
+  return firstTokenCount(
+    ...CACHE_WRITE_METADATA_KEYS.flatMap(([namespace, key]) => {
+      const scope = providerMetadata[namespace];
+      if (!isRecord(scope)) return [];
+      const usage = scope["usage"];
+      return [scope[key], isRecord(usage) ? usage[key] : void 0];
+    })
+  );
+}
+function extractUsageMetricsFromUsage(usage, provider, providerMetadata) {
+  if (!isRecord(usage)) return {};
+  const inputTokenValue = usage["inputTokens"];
+  const outputTokenValue = usage["outputTokens"];
+  const inputTokenDetails = usage["inputTokenDetails"];
+  const outputTokenDetails = usage["outputTokenDetails"];
+  const hasStructuredUsage = isRecord(inputTokenValue) || isRecord(outputTokenValue) || isRecord(inputTokenDetails) || isRecord(outputTokenDetails);
+  const inputTokens = firstTokenCount(
+    isRecord(inputTokenValue) ? inputTokenValue["total"] : void 0,
+    inputTokenValue,
+    usage["promptTokens"],
+    usage["prompt_tokens"]
+  );
+  const outputTokens = firstTokenCount(
+    isRecord(outputTokenValue) ? outputTokenValue["total"] : void 0,
+    outputTokenValue,
+    usage["completionTokens"],
+    usage["completion_tokens"]
+  );
+  const reasoningTokens = firstTokenCount(
+    isRecord(outputTokenValue) ? outputTokenValue["reasoning"] : void 0,
+    isRecord(outputTokenDetails) ? outputTokenDetails["reasoningTokens"] : void 0,
+    usage["reasoningTokens"],
+    usage["completionReasoningTokens"],
+    usage["completion_reasoning_tokens"],
+    usage["reasoning_tokens"],
+    usage["thinkingTokens"],
+    usage["thinking_tokens"]
+  );
+  const cacheReadInputTokens = firstTokenCount(
+    isRecord(inputTokenValue) ? inputTokenValue["cacheRead"] : void 0,
+    isRecord(inputTokenDetails) ? inputTokenDetails["cacheReadTokens"] : void 0,
+    usage["cachedInputTokens"],
+    usage["promptCachedTokens"],
+    usage["prompt_cached_tokens"]
+  );
+  const cacheWriteInputTokens = firstTokenCount(
+    isRecord(inputTokenValue) ? inputTokenValue["cacheWrite"] : void 0,
+    isRecord(inputTokenDetails) ? inputTokenDetails["cacheWriteTokens"] : void 0,
+    usage["cacheWriteInputTokens"],
+    usage["cacheCreationInputTokens"],
+    usage["cache_creation_input_tokens"],
+    cacheWriteTokensFromProviderMetadata(providerMetadata)
+  );
+  const nonCachedInputTokens = firstTokenCount(
+    isRecord(inputTokenValue) ? inputTokenValue["noCache"] : void 0,
+    isRecord(inputTokenDetails) ? inputTokenDetails["noCacheTokens"] : void 0
+  );
+  const nonReasoningOutputTokens = firstTokenCount(
+    isRecord(outputTokenValue) ? outputTokenValue["text"] : void 0,
+    isRecord(outputTokenDetails) ? outputTokenDetails["textTokens"] : void 0
+  );
+  const totalTokens = firstTokenCount(
+    usage["totalTokens"],
+    usage["tokens"],
+    usage["total_tokens"],
+    inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0
+  );
+  return {
+    inputTokens,
+    outputTokens,
+    totalTokens,
+    nonCachedInputTokens,
+    nonReasoningOutputTokens,
+    reasoningTokens,
+    cacheReadInputTokens,
+    cachedInputTokens: cacheReadInputTokens,
+    cacheWriteInputTokens,
+    ...hasStructuredUsage ? {} : flatUsageSemantics(provider)
+  };
+}
+
 // src/internal/raindrop-telemetry-integration.ts
 function hasUnresolvedToolApproval(event) {
   var _a;
@@ -2244,7 +2612,7 @@ var RaindropTelemetryIntegration = class {
     };
     // ── onStart ─────────────────────────────────────────────────────────────
     this.onStart = (event) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
       if (event.isEnabled === false) return;
       const isEmbed = event.operationId === "ai.embed" || event.operationId === "ai.embedMany";
       const recordInputs = event.recordInputs !== false;
@@ -2254,15 +2622,20 @@ var RaindropTelemetryIntegration = class {
       const callContextMetadata = getCurrentRaindropCallMetadata();
       const metadata = eventMetadata2 != null ? eventMetadata2 : callContextMetadata == null ? void 0 : callContextMetadata.rawMetadata;
       const callMeta = this.extractRaindropMetadata(metadata);
+      const identity = {
+        userId: (_b = callMeta.userId) != null ? _b : (_a = this.defaultContext) == null ? void 0 : _a.userId,
+        convoId: (_d = callMeta.convoId) != null ? _d : (_c = this.defaultContext) == null ? void 0 : _c.convoId,
+        eventName: (_f = callMeta.eventName) != null ? _f : (_e = this.defaultContext) == null ? void 0 : _e.eventName
+      };
       const inherited = getContextManager().getParentSpanIds();
       const eventIdGenerated = (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === "true" || (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === true || (callContextMetadata == null ? void 0 : callContextMetadata.eventIdGenerated) === true;
       const explicitEventId = callMeta.eventId && !eventIdGenerated ? callMeta.eventId : void 0;
-      const eventId = (_d = (_c = (_b = explicitEventId != null ? explicitEventId : (_a = this.defaultContext) == null ? void 0 : _a.eventId) != null ? _b : inherited == null ? void 0 : inherited.eventId) != null ? _c : callMeta.eventId) != null ? _d : randomUUID();
+      const eventId = (_j = (_i = (_h = explicitEventId != null ? explicitEventId : (_g = this.defaultContext) == null ? void 0 : _g.eventId) != null ? _h : inherited == null ? void 0 : inherited.eventId) != null ? _i : callMeta.eventId) != null ? _j : randomUUID();
       const inheritedParent = inherited && inherited.eventId === eventId ? { traceIdB64: inherited.traceIdB64, spanIdB64: inherited.spanIdB64 } : void 0;
       const { operationName, resourceName } = opName(event.operationId, functionId);
       const parentToolContext = !isEmbed && this.subagentWrapping ? getCurrentParentToolContext() : void 0;
       const metadataSubagentName = !isEmbed && this.subagentWrapping && parentToolContext === void 0 ? typeof (metadata == null ? void 0 : metadata["eve.subagent.name"]) === "string" ? metadata["eve.subagent.name"] : typeof (metadata == null ? void 0 : metadata["ash.subagent.name"]) === "string" ? metadata["ash.subagent.name"] : void 0 : void 0;
-      const subagentName = (_e = parentToolContext == null ? void 0 : parentToolContext.toolName) != null ? _e : metadataSubagentName;
+      const subagentName = (_k = parentToolContext == null ? void 0 : parentToolContext.toolName) != null ? _k : metadataSubagentName;
       let subagentToolCallSpan;
       let rootParentOverride;
       if (subagentName && this.sendTraces) {
@@ -2275,6 +2648,7 @@ var RaindropTelemetryIntegration = class {
           name: subagentName,
           parent: inheritedParent,
           eventId,
+          ...identity,
           operationId: "ai.toolCall",
           attributes: [
             attrString("operation.name", "ai.toolCall"),
@@ -2291,6 +2665,7 @@ var RaindropTelemetryIntegration = class {
           name: "agent.subagent",
           parent: subagentParentRef,
           eventId,
+          ...identity,
           operationId: "agent.subagent",
           attributes: [
             attrString("operation.name", "agent.subagent"),
@@ -2318,6 +2693,7 @@ var RaindropTelemetryIntegration = class {
           name: event.operationId,
           parent: rootParentOverride != null ? rootParentOverride : inheritedParent,
           eventId,
+          ...identity,
           operationId: event.operationId,
           attributes: [
             attrString("operation.name", operationName),
@@ -2325,13 +2701,14 @@ var RaindropTelemetryIntegration = class {
             attrString("ai.telemetry.functionId", functionId),
             attrString("ai.model.provider", event.provider),
             attrString("ai.model.id", event.modelId),
-            // Filter out raindrop.eventId from metadata attrs since TraceShipper
-            // already sets it via the eventId arg. Without this, eventMetadata()'s
-            // auto-generated ID would duplicate and override the resolved one.
+            // Filter out identity keys (eventId/userId/convoId/eventName) from
+            // metadata attrs since TraceShipper already stamps them via dedicated
+            // args. Without this, eventMetadata()'s auto-generated ID would
+            // duplicate and override the resolved one.
             ...attrsFromTelemetryMetadata(
               metadata ? Object.fromEntries(
                 Object.entries(metadata).filter(
-                  ([k]) => k !== "raindrop.eventId" && k !== "raindrop.internal.eventIdGenerated"
+                  ([k]) => k !== "raindrop.eventId" && k !== "raindrop.internal.eventIdGenerated" && k !== "raindrop.userId" && k !== "raindrop.convoId" && k !== "raindrop.eventName"
                 )
               ) : void 0
             ),
@@ -2343,10 +2720,13 @@ var RaindropTelemetryIntegration = class {
       this.callStates.set(event.callId, {
         operationId: event.operationId,
         eventId,
+        identity,
         rootSpan,
         rootParent: rootSpan ? this.spanParentRef(rootSpan) : rootParentOverride != null ? rootParentOverride : inheritedParent,
         stepSpan: void 0,
         stepParent: void 0,
+        stepProvider: void 0,
+        stepModelId: void 0,
         toolSpans: /* @__PURE__ */ new Map(),
         embedSpans: /* @__PURE__ */ new Map(),
         parentContextToolCallIds: /* @__PURE__ */ new Set(),
@@ -2394,20 +2774,22 @@ var RaindropTelemetryIntegration = class {
         name: stepOperationId,
         parent: state.rootParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: stepOperationId,
         attributes: [
           attrString("operation.name", operationName),
           attrString("resource.name", resourceName),
           attrString("ai.telemetry.functionId", state.functionId),
-          attrString("ai.model.provider", event.provider),
+          ...attrsFromModelProvider(event.provider),
           attrString("ai.model.id", event.modelId),
-          attrString("gen_ai.system", event.provider),
-          attrString("gen_ai.request.model", event.modelId),
+          attrString(MODEL_USAGE_ATTRIBUTES.requestModel, event.modelId),
           ...inputAttrs
         ]
       });
       state.stepSpan = stepSpan;
       state.stepParent = this.spanParentRef(stepSpan);
+      state.stepProvider = event.provider;
+      state.stepModelId = event.modelId;
     };
     this.onToolExecutionStart = (event) => this.toolExecutionStart(event);
     this.onToolExecutionEnd = (event) => this.toolExecutionEnd(event);
@@ -2458,23 +2840,24 @@ var RaindropTelemetryIntegration = class {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const state = this.getState(event.callId);
       if (!(state == null ? void 0 : state.stepSpan)) return;
+      const responseModelId = (_b = (_a = event.response) == null ? void 0 : _a.modelId) != null ? _b : state.stepModelId;
       const outputAttrs = [];
       if (state.recordOutputs) {
         outputAttrs.push(
           attrString("ai.response.finishReason", event.finishReason),
-          attrString("ai.response.text", capText2((_a = event.text) != null ? _a : void 0)),
-          attrString("ai.response.id", (_b = event.response) == null ? void 0 : _b.id),
-          attrString("ai.response.model", (_c = event.response) == null ? void 0 : _c.modelId),
+          attrString("ai.response.text", capText2((_c = event.text) != null ? _c : void 0)),
+          attrString("ai.response.id", (_d = event.response) == null ? void 0 : _d.id),
+          attrString("ai.response.model", responseModelId),
           attrString(
             "ai.response.timestamp",
-            ((_d = event.response) == null ? void 0 : _d.timestamp) instanceof Date ? event.response.timestamp.toISOString() : (_e = event.response) == null ? void 0 : _e.timestamp
+            ((_e = event.response) == null ? void 0 : _e.timestamp) instanceof Date ? event.response.timestamp.toISOString() : (_f = event.response) == null ? void 0 : _f.timestamp
           ),
           attrString(
             "ai.response.providerMetadata",
             event.providerMetadata ? safeJsonWithUint8(event.providerMetadata) : void 0
           )
         );
-        if (((_f = event.toolCalls) == null ? void 0 : _f.length) > 0) {
+        if (((_g = event.toolCalls) == null ? void 0 : _g.length) > 0) {
           outputAttrs.push(
             attrString(
               "ai.response.toolCalls",
@@ -2488,7 +2871,7 @@ var RaindropTelemetryIntegration = class {
             )
           );
         }
-        if (((_g = event.reasoning) == null ? void 0 : _g.length) > 0) {
+        if (((_h = event.reasoning) == null ? void 0 : _h.length) > 0) {
           const reasoningText = event.reasoning.filter((part) => "text" in part).map((part) => part.text).join("\n");
           if (reasoningText) {
             outputAttrs.push(attrString("ai.response.reasoning", capText2(reasoningText)));
@@ -2497,25 +2880,31 @@ var RaindropTelemetryIntegration = class {
       }
       outputAttrs.push(
         attrStringArray("gen_ai.response.finish_reasons", [event.finishReason]),
-        attrString("gen_ai.response.id", (_h = event.response) == null ? void 0 : _h.id),
-        attrString("gen_ai.response.model", (_i = event.response) == null ? void 0 : _i.modelId)
+        attrString("gen_ai.response.id", (_i = event.response) == null ? void 0 : _i.id),
+        attrString(MODEL_USAGE_ATTRIBUTES.responseModel, responseModelId)
       );
       const usage = event.usage;
       if (usage) {
+        const usageMetrics = extractUsageMetricsFromUsage(
+          usage,
+          state.stepProvider,
+          event.providerMetadata
+        );
         outputAttrs.push(
-          attrInt("ai.usage.inputTokens", usage.inputTokens),
-          attrInt("ai.usage.outputTokens", usage.outputTokens),
-          attrInt("ai.usage.totalTokens", usage.totalTokens),
-          attrInt("ai.usage.reasoningTokens", usage.reasoningTokens),
-          attrInt("ai.usage.cachedInputTokens", usage.cachedInputTokens),
-          attrInt("gen_ai.usage.input_tokens", usage.inputTokens),
-          attrInt("gen_ai.usage.output_tokens", usage.outputTokens)
+          attrInt("ai.usage.inputTokens", usageMetrics.inputTokens),
+          attrInt("ai.usage.outputTokens", usageMetrics.outputTokens),
+          attrInt("ai.usage.totalTokens", usageMetrics.totalTokens),
+          attrInt("ai.usage.reasoningTokens", usageMetrics.reasoningTokens),
+          attrInt("ai.usage.cachedInputTokens", usageMetrics.cachedInputTokens),
+          ...buildModelUsageAttributes(usageMetrics)
         );
       }
       this.emitProviderExecutedToolSpans(event, state);
       this.traceShipper.endSpan(state.stepSpan, { attributes: outputAttrs });
       state.stepSpan = void 0;
       state.stepParent = void 0;
+      state.stepProvider = void 0;
+      state.stepModelId = void 0;
     };
     // ── onEmbedStart ────────────────────────────────────────────────────────
     this.onEmbedStart = (event) => {
@@ -2527,6 +2916,7 @@ var RaindropTelemetryIntegration = class {
         name: event.operationId,
         parent: state.rootParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: event.operationId,
         attributes: [
           attrString("operation.name", operationName),
@@ -2589,6 +2979,8 @@ var RaindropTelemetryIntegration = class {
       const actualError = (_a = event.error) != null ? _a : error;
       if (state.stepSpan) {
         this.traceShipper.endSpan(state.stepSpan, { error: actualError });
+        state.stepProvider = void 0;
+        state.stepModelId = void 0;
       }
       for (const embedSpan of state.embedSpans.values()) {
         this.traceShipper.endSpan(embedSpan, { error: actualError });
@@ -2632,6 +3024,8 @@ var RaindropTelemetryIntegration = class {
         this.traceShipper.endSpan(state.stepSpan, { attributes: [abortedAttr] });
         state.stepSpan = void 0;
         state.stepParent = void 0;
+        state.stepProvider = void 0;
+        state.stepModelId = void 0;
       }
       for (const embedSpan of state.embedSpans.values()) {
         this.traceShipper.endSpan(embedSpan, { attributes: [abortedAttr] });
@@ -2793,6 +3187,7 @@ var RaindropTelemetryIntegration = class {
       name: "ai.toolCall",
       parent: state.stepParent,
       eventId: state.eventId,
+      ...state.identity,
       operationId: "ai.toolCall",
       attributes: [
         attrString("operation.name", operationName),
@@ -2870,6 +3265,7 @@ var RaindropTelemetryIntegration = class {
         name: "ai.toolCall",
         parent: state.stepParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: "ai.toolCall",
         attributes: [
           attrString("operation.name", operationName),
@@ -2929,12 +3325,13 @@ var RaindropTelemetryIntegration = class {
       }
       const usage = (_d = event.totalUsage) != null ? _d : event.usage;
       if (usage) {
+        const usageMetrics = extractUsageMetricsFromUsage(usage);
         outputAttrs.push(
-          attrInt("ai.usage.inputTokens", usage.inputTokens),
-          attrInt("ai.usage.outputTokens", usage.outputTokens),
-          attrInt("ai.usage.totalTokens", usage.totalTokens),
-          attrInt("ai.usage.reasoningTokens", usage.reasoningTokens),
-          attrInt("ai.usage.cachedInputTokens", usage.cachedInputTokens)
+          attrInt("ai.usage.inputTokens", usageMetrics.inputTokens),
+          attrInt("ai.usage.outputTokens", usageMetrics.outputTokens),
+          attrInt("ai.usage.totalTokens", usageMetrics.totalTokens),
+          attrInt("ai.usage.reasoningTokens", usageMetrics.reasoningTokens),
+          attrInt("ai.usage.cachedInputTokens", usageMetrics.cachedInputTokens)
         );
       }
       outputAttrs.push(attrInt("ai.toolCall.count", state.toolCallCount));
@@ -3387,14 +3784,6 @@ function runWithParentSpanContextSync(ctx, fn) {
 function isAsyncIterable(value) {
   return value !== null && typeof value === "object" && Symbol.asyncIterator in value;
 }
-function firstFiniteNumber(...values) {
-  for (const value of values) {
-    if (typeof value === "number" && Number.isFinite(value)) {
-      return value;
-    }
-  }
-  return void 0;
-}
 function resolveUsageRecord(result) {
   if (!isRecord(result)) return void 0;
   let usage;
@@ -3410,50 +3799,7 @@ function resolveUsageRecord(result) {
   return isRecord(usage) ? usage : void 0;
 }
 function extractUsageMetrics(result) {
-  const usage = resolveUsageRecord(result);
-  if (!usage) return {};
-  const inputTokenValue = usage["inputTokens"];
-  const outputTokenValue = usage["outputTokens"];
-  const inputTokens = firstFiniteNumber(
-    isRecord(inputTokenValue) ? inputTokenValue["total"] : void 0,
-    inputTokenValue,
-    usage["promptTokens"],
-    usage["prompt_tokens"]
-  );
-  const outputTokens = firstFiniteNumber(
-    isRecord(outputTokenValue) ? outputTokenValue["total"] : void 0,
-    outputTokenValue,
-    usage["completionTokens"],
-    usage["completion_tokens"]
-  );
-  const totalTokens = firstFiniteNumber(
-    usage["totalTokens"],
-    usage["tokens"],
-    usage["total_tokens"],
-    inputTokens !== void 0 && outputTokens !== void 0 ? inputTokens + outputTokens : void 0
-  );
-  const reasoningTokens = firstFiniteNumber(
-    isRecord(outputTokenValue) ? outputTokenValue["reasoning"] : void 0,
-    usage["reasoningTokens"],
-    usage["completionReasoningTokens"],
-    usage["completion_reasoning_tokens"],
-    usage["reasoning_tokens"],
-    usage["thinkingTokens"],
-    usage["thinking_tokens"]
-  );
-  const cachedInputTokens = firstFiniteNumber(
-    isRecord(inputTokenValue) ? inputTokenValue["cacheRead"] : void 0,
-    usage["cachedInputTokens"],
-    usage["promptCachedTokens"],
-    usage["prompt_cached_tokens"]
-  );
-  return {
-    inputTokens,
-    outputTokens,
-    totalTokens,
-    reasoningTokens,
-    cachedInputTokens
-  };
+  return extractUsageMetricsFromUsage(resolveUsageRecord(result));
 }
 function isObjectOperation(operation) {
   return operation === "generateObject" || operation === "streamObject";
@@ -3537,6 +3883,9 @@ function teeStreamObjectBaseStream(result) {
   } catch (e) {
   }
 }
+function identityFromContext(ctx) {
+  return { userId: ctx.userId, convoId: ctx.convoId, eventName: ctx.eventName };
+}
 function setupOperation(params) {
   var _a, _b, _c;
   const {
@@ -3568,6 +3917,7 @@ function setupOperation(params) {
     name: outerOperationId,
     parent: inheritedParent,
     eventId,
+    ...identityFromContext(mergedCtx),
     operationId: outerOperationId,
     attributes: [
       attrString("operation.name", operationName),
@@ -3576,9 +3926,6 @@ function setupOperation(params) {
       attrString("ai.model.provider", modelInfoFromArgs.provider),
       attrString("ai.model.id", modelInfoFromArgs.modelId),
       attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-      attrString("ai.telemetry.metadata.raindrop.eventName", mergedCtx.eventName),
-      attrString("ai.telemetry.metadata.raindrop.ai.userId", mergedCtx.userId),
-      attrString("ai.telemetry.metadata.raindrop.convoId", mergedCtx.convoId),
       ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
       ...attrsFromHeaders(isRecord(arg) ? arg["headers"] : void 0),
       ...attrsFromSettings(arg),
@@ -3668,6 +4015,7 @@ function createFinalize(params) {
         responseMessages,
         rootSpan: setup.rootSpan,
         eventId: setup.eventId,
+        ...identityFromContext(setup.ctx),
         telemetry: setup.telemetry,
         toolCalls: setup.toolCalls,
         traceShipper,
@@ -3706,6 +4054,11 @@ function createFinalize(params) {
         input,
         output,
         model: finalModel,
+        usage: {
+          promptTokens: usage == null ? void 0 : usage.inputTokens,
+          completionTokens: usage == null ? void 0 : usage.outputTokens
+        },
+        error,
         properties: patch.properties,
         featureFlags: patch.featureFlags,
         attachments: patch.attachments,
@@ -3740,6 +4093,7 @@ function startToolSpan(toolCall, rootSpan, ctx, startTimeUnixNano) {
     name: "ai.toolCall",
     parent: { traceIdB64: rootSpan.ids.traceIdB64, spanIdB64: rootSpan.ids.spanIdB64 },
     eventId: ctx.eventId,
+    ...identityFromContext(ctx),
     operationId: "ai.toolCall",
     attributes: [
       attrString("operation.name", operationName),
@@ -3777,6 +4131,9 @@ function emitTranscriptToolCallSpans(params) {
   }
   const ctx = {
     eventId: params.eventId,
+    userId: params.userId,
+    convoId: params.convoId,
+    eventName: params.eventName,
     telemetry: params.telemetry,
     traceShipper: params.traceShipper
   };
@@ -4156,6 +4513,7 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
       name: outerOperationId,
       parent: inheritedParent,
       eventId,
+      ...identityFromContext(ctx),
       operationId: outerOperationId,
       attributes: [
         attrString("operation.name", operationName),
@@ -4164,9 +4522,6 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
         attrString("ai.model.provider", modelInfoFromArgs.provider),
         attrString("ai.model.id", modelInfoFromArgs.modelId),
         attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-        attrString("ai.telemetry.metadata.raindrop.eventName", ctx.eventName),
-        attrString("ai.telemetry.metadata.raindrop.ai.userId", ctx.userId),
-        attrString("ai.telemetry.metadata.raindrop.convoId", ctx.convoId),
         ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
         ...attrsFromHeaders(mergedArgs["headers"]),
         ...attrsFromSettings(mergedArgs),
@@ -4231,6 +4586,7 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
           responseMessages,
           rootSpan,
           eventId,
+          ...identityFromContext(ctx),
           telemetry,
           toolCalls,
           traceShipper: deps.traceShipper,
@@ -4283,6 +4639,11 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
           input,
           output,
           model: finalModel,
+          usage: {
+            promptTokens: usage == null ? void 0 : usage.inputTokens,
+            completionTokens: usage == null ? void 0 : usage.outputTokens
+          },
+          error,
           properties: patch.properties,
           featureFlags: patch.featureFlags,
           attachments: patch.attachments,
@@ -4366,6 +4727,7 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
       name: outerOperationId,
       parent: inheritedParent,
       eventId,
+      ...identityFromContext(ctx),
       operationId: outerOperationId,
       attributes: [
         attrString("operation.name", operationName),
@@ -4374,9 +4736,6 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
         attrString("ai.model.provider", modelInfoFromArgs.provider),
         attrString("ai.model.id", modelInfoFromArgs.modelId),
         attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-        attrString("ai.telemetry.metadata.raindrop.eventName", ctx.eventName),
-        attrString("ai.telemetry.metadata.raindrop.ai.userId", ctx.userId),
-        attrString("ai.telemetry.metadata.raindrop.convoId", ctx.convoId),
         ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
         ...attrsFromHeaders(mergedArgs["headers"]),
         ...attrsFromSettings(mergedArgs),
@@ -4441,6 +4800,7 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
           responseMessages,
           rootSpan,
           eventId,
+          ...identityFromContext(ctx),
           telemetry,
           toolCalls,
           traceShipper: deps.traceShipper,
@@ -4493,6 +4853,11 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
           input,
           output,
           model: finalModel,
+          usage: {
+            promptTokens: usage == null ? void 0 : usage.inputTokens,
+            completionTokens: usage == null ? void 0 : usage.outputTokens
+          },
+          error,
           properties: patch.properties,
           featureFlags: patch.featureFlags,
           attachments: patch.attachments,
@@ -4590,6 +4955,7 @@ function wrapToolExecute(name, tool, ctx, toolCalls) {
       name: "ai.toolCall",
       parent,
       eventId: ctx.eventId,
+      ...identityFromContext(ctx.context),
       operationId: "ai.toolCall",
       attributes: [
         attrString("operation.name", operationName),
@@ -4824,8 +5190,13 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
             ended = true;
             const msToFirstChunk = firstChunkMs !== void 0 ? firstChunkMs - startMs : void 0;
             const msToFinish = finishMs !== void 0 ? finishMs - startMs : void 0;
-            const inputTokens = extractNestedTokens(usage, "inputTokens");
-            const outputTokens = extractNestedTokens(usage, "outputTokens");
+            const usageMetrics = extractUsageMetricsFromUsage(
+              usage,
+              modelInfo.provider,
+              providerMetadata
+            );
+            const finalResponseModelId = responseModelId != null ? responseModelId : modelInfo.modelId;
+            const { inputTokens, outputTokens } = usageMetrics;
             const avgOutTokensPerSecond = msToFinish && outputTokens !== void 0 && msToFinish > 0 ? 1e3 * outputTokens / msToFinish : void 0;
             ctx.traceShipper.endSpan(span, {
               attributes: [
@@ -4837,7 +5208,7 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
                     safeJsonWithUint8(toolCallsLocal.length ? toolCallsLocal : void 0)
                   ),
                   attrString("ai.response.id", responseId),
-                  attrString("ai.response.model", responseModelId),
+                  attrString("ai.response.model", finalResponseModelId),
                   attrString("ai.response.timestamp", responseTimestampIso),
                   attrString(
                     "ai.response.providerMetadata",
@@ -4848,9 +5219,8 @@ function wrapModel(args, aiSDK, outerOperationId, ctx) {
                 attrInt("ai.usage.outputTokens", outputTokens),
                 ...finishReason ? [attrStringArray("gen_ai.response.finish_reasons", [finishReason])] : [],
                 attrString("gen_ai.response.id", responseId),
-                attrString("gen_ai.response.model", responseModelId),
-                attrInt("gen_ai.usage.input_tokens", inputTokens),
-                attrInt("gen_ai.usage.output_tokens", outputTokens),
+                attrString(MODEL_USAGE_ATTRIBUTES.responseModel, finalResponseModelId),
+                ...buildModelUsageAttributes(usageMetrics),
                 ...msToFirstChunk !== void 0 ? [attrInt("ai.stream.msToFirstChunk", msToFirstChunk)] : [],
                 ...msToFinish !== void 0 ? [attrInt("ai.stream.msToFinish", msToFinish)] : [],
                 ...avgOutTokensPerSecond !== void 0 ? [attrDouble("ai.stream.avgOutputTokensPerSecond", avgOutTokensPerSecond)] : [],
@@ -4950,20 +5320,20 @@ function startDoGenerateSpan(operationId, options, modelInfo, parent, ctx) {
     name: operationId,
     parent,
     eventId: ctx.eventId,
+    ...identityFromContext(ctx.context),
     operationId,
     attributes: [
       attrString("operation.name", operationName),
       attrString("resource.name", resourceName),
       attrString("ai.telemetry.functionId", (_b = ctx.telemetry) == null ? void 0 : _b.functionId),
-      attrString("ai.model.provider", modelInfo.provider),
+      ...attrsFromModelProvider(modelInfo.provider),
       attrString("ai.model.id", modelInfo.modelId),
       ...((_c = ctx.telemetry) == null ? void 0 : _c.recordInputs) === false ? [] : [
         attrString("ai.prompt.messages", promptJson),
         attrStringArray("ai.prompt.tools", toolsJson),
         attrString("ai.prompt.toolChoice", toolChoiceJson)
       ],
-      attrString("gen_ai.system", modelInfo.provider),
-      attrString("gen_ai.request.model", modelInfo.modelId),
+      attrString(MODEL_USAGE_ATTRIBUTES.requestModel, modelInfo.modelId),
       ...attrsFromGenAiRequest(options),
       attrProviderOptions(options)
     ]
@@ -4996,8 +5366,12 @@ function endDoGenerateSpan(span, result, modelInfo, ctx) {
   } else {
     responseTimestampIso = (/* @__PURE__ */ new Date()).toISOString();
   }
-  const inputTokens = extractNestedTokens(usage, "inputTokens");
-  const outputTokens = extractNestedTokens(usage, "outputTokens");
+  const usageMetrics = extractUsageMetricsFromUsage(
+    usage,
+    modelInfo.provider,
+    providerMetadata
+  );
+  const { inputTokens, outputTokens } = usageMetrics;
   ctx.traceShipper.endSpan(span, {
     attributes: [
       ...((_a = ctx.telemetry) == null ? void 0 : _a.recordOutputs) === false ? [] : [
@@ -5016,9 +5390,8 @@ function endDoGenerateSpan(span, result, modelInfo, ctx) {
       attrInt("ai.usage.completionTokens", outputTokens),
       ...finishReason ? [attrStringArray("gen_ai.response.finish_reasons", [finishReason])] : [],
       attrString("gen_ai.response.id", responseId),
-      attrString("gen_ai.response.model", responseModelId),
-      attrInt("gen_ai.usage.input_tokens", inputTokens),
-      attrInt("gen_ai.usage.output_tokens", outputTokens)
+      attrString(MODEL_USAGE_ATTRIBUTES.responseModel, responseModelId),
+      ...buildModelUsageAttributes(usageMetrics)
     ]
   });
 }
@@ -5033,20 +5406,20 @@ function startDoStreamSpan(operationId, options, modelInfo, parent, ctx) {
     name: operationId,
     parent,
     eventId: ctx.eventId,
+    ...identityFromContext(ctx.context),
     operationId,
     attributes: [
       attrString("operation.name", operationName),
       attrString("resource.name", resourceName),
       attrString("ai.telemetry.functionId", (_b = ctx.telemetry) == null ? void 0 : _b.functionId),
-      attrString("ai.model.provider", modelInfo.provider),
+      ...attrsFromModelProvider(modelInfo.provider),
       attrString("ai.model.id", modelInfo.modelId),
       ...((_c = ctx.telemetry) == null ? void 0 : _c.recordInputs) === false ? [] : [
         attrString("ai.prompt.messages", promptJson),
         attrStringArray("ai.prompt.tools", toolsJson),
         attrString("ai.prompt.toolChoice", toolChoiceJson)
       ],
-      attrString("gen_ai.system", modelInfo.provider),
-      attrString("gen_ai.request.model", modelInfo.modelId),
+      attrString(MODEL_USAGE_ATTRIBUTES.requestModel, modelInfo.modelId),
       ...attrsFromGenAiRequest(options),
       attrProviderOptions(options)
     ]
@@ -5111,13 +5484,6 @@ function mergeAttachments(...groups) {
   }
   return merged.length ? merged : void 0;
 }
-function extractNestedTokens(usage, key) {
-  if (!isRecord(usage)) return void 0;
-  const val = usage[key];
-  if (typeof val === "number") return val;
-  if (isRecord(val) && typeof val["total"] === "number") return val["total"];
-  return void 0;
-}
 
 // src/index.ts
 function eventMetadata(options) {
@@ -5293,6 +5659,9 @@ function createRaindropAISDK(opts) {
           const internal = traceShipper.startSpan({
             name: args.name,
             eventId: args.eventId,
+            userId: args.userId,
+            convoId: args.convoId,
+            eventName: args.eventName,
             parent,
             operationId: args.operationId,
             attributes: attrs
@@ -5327,6 +5696,9 @@ function createRaindropAISDK(opts) {
           const internal = traceShipper.startSpan({
             name: args.name,
             eventId: args.eventId,
+            userId: args.userId,
+            convoId: args.convoId,
+            eventName: args.eventName,
             parent,
             operationId: args.operationId,
             attributes: startAttrs,