feat: remove config unify logs for all cache clients (#4558)

Signed-off-by: Mariusz Jasuwienas <[email protected]>

Author: jasuwienas

packages/relay/src/lib/clients/cache/measurableCache.ts

@@ -15,7 +15,6 @@ export class MeasurableCache implements ICacheClient {
 
   public static readonly methods = {
     GET: 'get',
-    GET_ASYNC: 'getAsync',
     SET: 'set',
     DELETE: 'delete',
     MSET: 'mSet',
@@ -26,18 +25,11 @@ export class MeasurableCache implements ICacheClient {
   };
 
   private cacheType: string;
-  private callMap: Map<string, string[]>;
-
-  public constructor(
-    decorated: ICacheClient,
-    cacheMethodsCounter: Counter,
-    cacheType: string,
-    callMap: Map<string, string[]>,
-  ) {
+
+  public constructor(decorated: ICacheClient, cacheMethodsCounter: Counter, cacheType: string) {
     this.decorated = decorated;
     this.cacheMethodsCounter = cacheMethodsCounter;
     this.cacheType = cacheType;
-    this.callMap = callMap;
   }
 
   /**
@@ -62,7 +54,7 @@ export class MeasurableCache implements ICacheClient {
    * @returns The cached value if found, otherwise null.
    */
   public async get(key: string, callingMethod: string): Promise<any> {
-    this.count(callingMethod, MeasurableCache.methods.GET_ASYNC);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.GET).inc(1);
     return await this.decorated.get(key, callingMethod);
   }
 
@@ -76,7 +68,7 @@ export class MeasurableCache implements ICacheClient {
    * @param ttl - Time to live for the cached value in milliseconds (optional).
    */
   public async set(key: string, value: any, callingMethod: string, ttl?: number): Promise<void> {
-    this.count(callingMethod, MeasurableCache.methods.SET);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.SET).inc(1);
     return await this.decorated.set(key, value, callingMethod, ttl);
   }
 
@@ -90,8 +82,8 @@ export class MeasurableCache implements ICacheClient {
    * @returns A Promise that resolves when the values are cached.
    */
   public async multiSet(keyValuePairs: Record<string, any>, callingMethod: string, ttl?: number): Promise<void> {
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.MSET).inc(1);
     await this.decorated.multiSet(keyValuePairs, callingMethod, ttl);
-    this.count(callingMethod, MeasurableCache.methods.MSET);
   }
 
   /**
@@ -104,8 +96,8 @@ export class MeasurableCache implements ICacheClient {
    * @returns A Promise that resolves when the values are cached.
    */
   public async pipelineSet(keyValuePairs: Record<string, any>, callingMethod: string, ttl?: number): Promise<void> {
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.PIPELINE).inc(1);
     await this.decorated.pipelineSet(keyValuePairs, callingMethod, ttl);
-    this.count(callingMethod, MeasurableCache.methods.PIPELINE);
   }
 
   /**
@@ -116,7 +108,7 @@ export class MeasurableCache implements ICacheClient {
    * @param callingMethod - The name of the method calling the cache.
    */
   public async delete(key: string, callingMethod: string): Promise<void> {
-    this.count(callingMethod, MeasurableCache.methods.DELETE);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.DELETE).inc(1);
     await this.decorated.delete(key, callingMethod);
   }
 
@@ -147,7 +139,7 @@ export class MeasurableCache implements ICacheClient {
    * @returns The value of the key after incrementing
    */
   public async incrBy(key: string, amount: number, callingMethod: string): Promise<number> {
-    this.count(callingMethod, MeasurableCache.methods.INCR_BY);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.INCR_BY).inc(1);
     return await this.decorated.incrBy(key, amount, callingMethod);
   }
 
@@ -162,7 +154,7 @@ export class MeasurableCache implements ICacheClient {
    * @returns The list of elements in the range
    */
   public async lRange(key: string, start: number, end: number, callingMethod: string): Promise<any[]> {
-    this.count(callingMethod, MeasurableCache.methods.LRANGE);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.LRANGE).inc(1);
     return await this.decorated.lRange(key, start, end, callingMethod);
   }
 
@@ -176,26 +168,7 @@ export class MeasurableCache implements ICacheClient {
    * @returns The length of the list after pushing
    */
   public async rPush(key: string, value: any, callingMethod: string): Promise<number> {
-    this.count(callingMethod, MeasurableCache.methods.RPUSH);
+    this.cacheMethodsCounter.labels(callingMethod, this.cacheType, MeasurableCache.methods.RPUSH).inc(1);
     return await this.decorated.rPush(key, value, callingMethod);
   }
-
-  /**
-   * Counts the number of occurrences of the given caching related operation.
-   * Depending on the underlying client implementation, the actual caching behavior may vary.
-   * The `callMap` allows us to account for these differences when counting occurrences.
-   *
-   * For example, if the underlying cache mechanism (such as LRU) does not provide an lRange method,
-   * we can implement it ourselves by using get and set instead. We want to count each lRange call
-   * as corresponding get and set calls then.
-   *
-   * @param caller The name of the calling method
-   * @param callee Actual caching operation
-   * @private
-   */
-  private count(caller: string, callee: string): void {
-    (this.callMap.get(callee) || [callee]).forEach((value: string) =>
-      this.cacheMethodsCounter.labels(caller, this.cacheType, value).inc(1),
-    );
-  }
 }

packages/relay/src/lib/factories/cacheClientFactory.ts

@@ -24,20 +24,7 @@ const measurable = (client: ICacheClient, register: Registry, configType: 'lru'
     labelNames: ['callingMethod', 'cacheType', 'method'],
   });
 
-  const config = {
-    lru: new Map([
-      [MeasurableCache.methods.GET_ASYNC, [MeasurableCache.methods.GET]],
-      [MeasurableCache.methods.MSET, [MeasurableCache.methods.SET]],
-      [MeasurableCache.methods.INCR_BY, [MeasurableCache.methods.GET, MeasurableCache.methods.SET]],
-      [MeasurableCache.methods.LRANGE, [MeasurableCache.methods.GET]],
-      [MeasurableCache.methods.RPUSH, [MeasurableCache.methods.GET, MeasurableCache.methods.SET]],
-    ]),
-    redis: ConfigService.get('MULTI_SET')
-      ? new Map()
-      : new Map([[MeasurableCache.methods.MSET, [MeasurableCache.methods.PIPELINE]]]),
-  };
-
-  return new MeasurableCache(client, methodsCounter, configType, config[configType]);
+  return new MeasurableCache(client, methodsCounter, configType);
 };
 
 export class CacheClientFactory {