@telemetry-dev/bedrock 0.1.7 → 0.1.8

package/dist/agents.mjs

@@ -1,4 +1,4 @@
-import { r as createInstrumentedSend, t as AGENT_HANDLERS } from "./internal-handlers-DzagsZVD.mjs";
+import { r as createInstrumentedSend, t as AGENT_HANDLERS } from "./internal-handlers-Byxp14OZ.mjs";
 import { BedrockAgentRuntimeClient } from "@aws-sdk/client-bedrock-agent-runtime";
 //#region src/agents.ts
 const WRAPPED = /* @__PURE__ */ new WeakSet();

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as RUNTIME_HANDLERS, r as createInstrumentedSend } from "./internal-handlers-DzagsZVD.mjs";
+import { n as RUNTIME_HANDLERS, r as createInstrumentedSend } from "./internal-handlers-Byxp14OZ.mjs";
 import { BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime";
 //#region src/index.ts
 const WRAPPED = /* @__PURE__ */ new WeakSet();

package/dist/{internal-handlers-DzagsZVD.mjs → internal-handlers-Byxp14OZ.mjs}

@@ -89,9 +89,23 @@ function safe(fn) {
 		return;
 	}
 }
+function withCacheInclusiveInput(fields) {
+	const usage = fields?.usage;
+	if (usage?.inputTokens === void 0) return fields;
+	const inputTokens = usage.inputTokens + (usage.cacheReadInputTokens ?? 0) + (usage.cacheCreationInputTokens ?? 0);
+	const totalTokens = usage.totalTokens !== void 0 && usage.outputTokens !== void 0 ? inputTokens + usage.outputTokens : usage.totalTokens;
+	return {
+		...fields,
+		usage: {
+			...usage,
+			inputTokens,
+			totalTokens
+		}
+	};
+}
 function endSpan(span, fields) {
 	try {
-		span.end(fields);
+		span.end(withCacheInclusiveInput(fields));
 	} catch {}
 }
 function updateSpan(span, fields) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telemetry-dev/bedrock",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "AWS Bedrock instrumentation for telemetry.dev: Converse, InvokeModel, and Bedrock Agents spans for AWS SDK v3 clients.",
   "keywords": [
     "aws",

package/src/internal.ts

@@ -145,9 +145,24 @@ export function safe<T>(fn: () => T): T | undefined {
   }
 }
 
+// Bedrock reports input tokens without cache reads and writes; span input tokens include them.
+function withCacheInclusiveInput(fields: SpanFields | undefined): SpanFields | undefined {
+  const usage = fields?.usage;
+
+  if (usage?.inputTokens === undefined) return fields;
+  const inputTokens =
+    usage.inputTokens + (usage.cacheReadInputTokens ?? 0) + (usage.cacheCreationInputTokens ?? 0);
+  const totalTokens =
+    usage.totalTokens !== undefined && usage.outputTokens !== undefined
+      ? inputTokens + usage.outputTokens
+      : usage.totalTokens;
+
+  return { ...fields, usage: { ...usage, inputTokens, totalTokens } };
+}
+
 export function endSpan(span: SpanHandle, fields?: SpanFields): void {
   try {
-    span.end(fields);
+    span.end(withCacheInclusiveInput(fields));
   } catch {
     // Instrumentation must never throw into caller code.
   }