Improve logging around tokens and fix initial read (#6149)

graphql-hive · Dec 21, 2024 · 90932da · 90932da
1 parent f0629e3
commit 90932da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/services/api/src/modules/token/providers/token-storage.ts b/packages/services/api/src/modules/token/providers/token-storage.ts
@@ -120,6 +120,7 @@ export class TokenStorage {
         this.logger.error(error);
       }
 
+      this.logger.error('Failed to fetch token', error);
       throw new HiveError('Invalid token provided', {
         originalError: error,
       });

diff --git a/packages/services/tokens/src/multi-tier-storage.ts b/packages/services/tokens/src/multi-tier-storage.ts
@@ -127,6 +127,8 @@ export async function createStorage(
             action: 'set',
           });
         });
+
+        return cacheEntry;
       } catch (error) {
         // If the DB is down, we log the error, and we throw exception.
         // This will cause the cache to return stale data.
@@ -193,6 +195,9 @@ export async function createStorage(
     async readToken(hashedToken, maskedToken) {
       const status: LRUCache.Status<CacheEntry> = {};
       const context = { maskedToken, source: 'in-memory' };
+      const tokenLogger = serverLogger.child({
+        maskedToken,
+      });
       const data = await cache.fetch(hashedToken, {
         context,
         status,
@@ -201,7 +206,11 @@ export async function createStorage(
       if (status.fetch) {
         recordCacheRead(status.fetch);
       } else {
-        serverLogger.warn('Status of the fetch is missing');
+        tokenLogger.warn('Status of the fetch is missing');
+      }
+
+      if (status.fetchError) {
+        tokenLogger.error('Fetch error in the In-Memory-Cache (error=%s)', status.fetchError);
       }
 
       if (!data) {

diff --git a/packages/services/usage/src/tokens.ts b/packages/services/usage/src/tokens.ts
@@ -51,6 +51,7 @@ export function createTokens(config: { endpoint: string; logger: ServiceLogger }
       }
       return TokenStatus.NotFound;
     } catch (error) {
+      config.logger.error('Failed to fetch fresh token', error);
       return TokenStatus.NotFound;
     }
   }