compute cache hit for getItems

Author: msonnb

packages/nitro/src/runtime/hooks/captureStorageEvents.ts

@@ -8,6 +8,7 @@ import {
 import {
   flushIfServerless,
   GLOBAL_OBJ,
+  isObjectLike,
   SEMANTIC_ATTRIBUTE_CACHE_HIT,
   SEMANTIC_ATTRIBUTE_CACHE_KEY,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -37,7 +38,7 @@ const TRACED_OPERATIONS = [
 
 type TracedOperation = (typeof TRACED_OPERATIONS)[number];
 
-const CACHE_HIT_OPERATIONS = new Set<TracedOperation>(['hasItem', 'getItem', 'getItemRaw']);
+const CACHE_HIT_OPERATIONS = new Set<TracedOperation>(['hasItem', 'getItem', 'getItemRaw', 'getItems']);
 
 /**
  * Maps each unstorage operation to a convention cache op. Reads (including existence and key
@@ -107,8 +108,7 @@ function setupStorageTracingChannel(operation: TracedOperation): void {
         if (!('error' in data)) {
           const result = (data as { result?: unknown }).result;
           if (CACHE_HIT_OPERATIONS.has(operation)) {
-            const hit = operation === 'hasItem' ? Boolean(result) : isCacheHit(data.keys?.[0], result);
-            span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, hit);
+            span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, resolveCacheHit(operation, data.keys?.[0], result));
           }
         }
 
@@ -118,6 +118,23 @@ function setupStorageTracingChannel(operation: TracedOperation): void {
   );
 }
 
+/**
+ * Resolves the `cache.hit` value for a read operation. `hasItem` returns a boolean directly,
+ * `getItems` returns a `{ key, value }[]` where a hit means at least one entry has a value,
+ * and single-key reads fall back to the value-based `isCacheHit` check.
+ */
+function resolveCacheHit(operation: TracedOperation, key: unknown, result: unknown): boolean {
+  if (operation === 'hasItem') {
+    return Boolean(result);
+  }
+
+  if (operation === 'getItems') {
+    return Array.isArray(result) && result.some(item => isObjectLike(item) && item.value != null);
+  }
+
+  return isCacheHit(key, result);
+}
+
 interface CacheEntry<T = unknown> {
   value?: T;
   expires?: number;

packages/nuxt/src/runtime/utils/instrumentStorage.ts

@@ -58,7 +58,7 @@ type DriverMethod = keyof Driver;
 /**
  * Methods that should have an attribute to indicate a cache hit.
  */
-const CACHE_HIT_METHODS = new Set<DriverMethod>(['hasItem', 'getItem', 'getItemRaw']);
+const CACHE_HIT_METHODS = new Set<DriverMethod>(['hasItem', 'getItem', 'getItemRaw', 'getItems']);
 
 /**
  * Maps each unstorage method to a convention cache op. Reads (including existence and key
@@ -181,8 +181,7 @@ function createMethodWrapper(
           span.setStatus({ code: SPAN_STATUS_OK });
 
           if (CACHE_HIT_METHODS.has(methodName)) {
-            const hit = methodName === 'hasItem' ? Boolean(result) : isCacheHit(args[0], result);
-            span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, hit);
+            span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, resolveCacheHit(methodName, args[0], result));
           }
 
           return result;
@@ -283,6 +282,23 @@ function normalizeKey(key: unknown, prefix: string): string {
 
 const CACHED_FN_HANDLERS_RE = /^nitro:(functions|handlers):/i;
 
+/**
+ * Resolves the `cache.hit` value for a read method. `hasItem` returns a boolean directly,
+ * `getItems` returns a `{ key, value }[]` where a hit means at least one entry has a value,
+ * and single-key reads fall back to the value-based `isCacheHit` check.
+ */
+function resolveCacheHit(methodName: DriverMethod, key: unknown, result: unknown): boolean {
+  if (methodName === 'hasItem') {
+    return Boolean(result);
+  }
+
+  if (methodName === 'getItems') {
+    return Array.isArray(result) && result.some(item => isObjectLike(item) && item.value != null);
+  }
+
+  return isCacheHit(key, result);
+}
+
 /**
  * Since Nitro's cache may not utilize the driver's TTL, it is possible that the value is present in the cache but won't be used by Nitro.
  * The maxAge and expires values are serialized by Nitro in the cache entry. This means the value presence does not necessarily mean a cache hit.