emit cache tokens even if 0

Author: dvirski

packages/instrumentation-anthropic/src/instrumentation.ts

@@ -530,13 +530,19 @@ export class AnthropicInstrumentation extends InstrumentationBase {
         );
 
         // Cache token attributes (v1.40)
-        if (result.usage.cache_creation_input_tokens != null) {
+        if (
+          result.usage.cache_creation_input_tokens !== null &&
+          result.usage.cache_creation_input_tokens !== undefined
+        ) {
           span.setAttribute(
             ATTR_GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS,
             result.usage.cache_creation_input_tokens,
           );
         }
-        if (result.usage.cache_read_input_tokens != null) {
+        if (
+          result.usage.cache_read_input_tokens !== null &&
+          result.usage.cache_read_input_tokens !== undefined
+        ) {
           span.setAttribute(
             ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
             result.usage.cache_read_input_tokens,

packages/instrumentation-bedrock/src/instrumentation.ts

@@ -703,13 +703,15 @@ export class BedrockInstrumentation extends InstrumentationBase {
                 [ATTR_GEN_AI_USAGE_OUTPUT_TOKENS]: usage["output_tokens"],
                 [SpanAttributes.GEN_AI_USAGE_TOTAL_TOKENS]:
                   (usage["input_tokens"] || 0) + (usage["output_tokens"] || 0),
-                ...(usage["cache_read_input_tokens"]
+                ...(usage["cache_read_input_tokens"] !== null &&
+                usage["cache_read_input_tokens"] !== undefined
                   ? {
                       [ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS]:
                         usage["cache_read_input_tokens"],
                     }
                   : {}),
-                ...(usage["cache_creation_input_tokens"]
+                ...(usage["cache_creation_input_tokens"] !== null &&
+                usage["cache_creation_input_tokens"] !== undefined
                   ? {
                       [ATTR_GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS]:
                         usage["cache_creation_input_tokens"],

packages/instrumentation-google-generativeai/src/instrumentation.ts

@@ -495,7 +495,7 @@ export class GenAIInstrumentation extends InstrumentationBase {
           SpanAttributes.GEN_AI_USAGE_REASONING_TOKENS,
           reasoningTokens,
         );
-      if (cachedTokens != null)
+      if (cachedTokens !== null && cachedTokens !== undefined)
         span.setAttribute(
           ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
           cachedTokens,

packages/instrumentation-openai/src/instrumentation.ts

@@ -970,7 +970,7 @@ export class OpenAIInstrumentation extends InstrumentationBase {
           );
         }
         const cachedTokens = result.usage.input_tokens_details?.cached_tokens;
-        if (cachedTokens) {
+        if (cachedTokens !== null && cachedTokens !== undefined) {
           span.setAttribute(
             ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
             cachedTokens,

packages/instrumentation-together/src/instrumentation.ts

@@ -525,7 +525,7 @@ export class TogetherInstrumentation extends InstrumentationBase {
         const cachedTokens = (
           result.usage as unknown as Record<string, unknown>
         ).cached_tokens;
-        if (cachedTokens) {
+        if (cachedTokens !== null && cachedTokens !== undefined) {
           span.setAttribute(
             ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
             cachedTokens as number,

packages/instrumentation-vertexai/src/vertexai-instrumentation.ts

@@ -253,7 +253,10 @@ export class VertexAIInstrumentation extends InstrumentationBase {
           streamResponse.usageMetadata.promptTokenCount,
         );
 
-      if (streamResponse.usageMetadata?.cachedContentTokenCount)
+      if (
+        streamResponse.usageMetadata?.cachedContentTokenCount !== null &&
+        streamResponse.usageMetadata?.cachedContentTokenCount !== undefined
+      )
         span.setAttribute(
           ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
           streamResponse.usageMetadata.cachedContentTokenCount,