Fix bugs on PR

Signed-off-by: belloibrahv <[email protected]>
hashgraph · Nov 5, 2024 · e2b3d2f · e2b3d2f
1 parent 7796aca
commit e2b3d2f
Show file tree

Hide file tree

Showing 30 changed files with 802 additions and 422 deletions.
diff --git a/packages/relay/src/lib/clients/cache/localLRUCache.ts b/packages/relay/src/lib/clients/cache/localLRUCache.ts
@@ -109,7 +109,9 @@ export class LocalLRUCache implements ICacheClient {
       const censoredKey = key.replace(Utils.IP_ADDRESS_REGEX, '<REDACTED>');
       const censoredValue = JSON.stringify(value).replace(/"ipAddress":"[^"]+"/, '"ipAddress":"<REDACTED>"');
       const message = `Returning cached value ${censoredKey}:${censoredValue} on ${callingMethod} call`;
-      this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+      }
       return value;
     }
 
@@ -125,9 +127,11 @@ export class LocalLRUCache implements ICacheClient {
    */
   public async getRemainingTtl(key: string, callingMethod: string, requestDetails: RequestDetails): Promise<number> {
     const remainingTtl = this.cache.getRemainingTTL(key); // in milliseconds
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} returning remaining TTL ${key}:${remainingTtl} on ${callingMethod} call`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} returning remaining TTL ${key}:${remainingTtl} on ${callingMethod} call`,
+      );
+    }
     return remainingTtl;
   }
 
@@ -158,9 +162,11 @@ export class LocalLRUCache implements ICacheClient {
     const message = `Caching ${censoredKey}:${censoredValue} on ${callingMethod} for ${
       resolvedTtl > 0 ? `${resolvedTtl} ms` : 'indefinite time'
     }`;
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} ${message} (cache size: ${this.cache.size}, max: ${this.options.max})`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} ${message} (cache size: ${this.cache.size}, max: ${this.options.max})`,
+      );
+    }
   }
 
   /**
@@ -211,7 +217,9 @@ export class LocalLRUCache implements ICacheClient {
    * @param {RequestDetails} requestDetails - The request details for logging and tracking.
    */
   public async delete(key: string, callingMethod: string, requestDetails: RequestDetails): Promise<void> {
-    this.logger.trace(`${requestDetails.formattedRequestId} delete cache for ${key}`);
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(`${requestDetails.formattedRequestId} delete cache for ${key}`);
+    }
     this.cache.delete(key);
   }
 
@@ -267,9 +275,11 @@ export class LocalLRUCache implements ICacheClient {
 
     const matchingKeys = keys.filter((key) => regex.test(key));
 
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} retrieving keys matching ${pattern} on ${callingMethod} call`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} retrieving keys matching ${pattern} on ${callingMethod} call`,
+      );
+    }
     return matchingKeys;
   }
 }
diff --git a/packages/relay/src/lib/clients/cache/redisCache.ts b/packages/relay/src/lib/clients/cache/redisCache.ts
@@ -137,7 +137,9 @@ export class RedisCache implements IRedisCacheClient {
       const censoredKey = key.replace(Utils.IP_ADDRESS_REGEX, '<REDACTED>');
       const censoredValue = result.replace(/"ipAddress":"[^"]+"/, '"ipAddress":"<REDACTED>"');
       const message = `Returning cached value ${censoredKey}:${censoredValue} on ${callingMethod} call`;
-      this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+      }
       // TODO: add metrics
       return JSON.parse(result);
     }
@@ -175,7 +177,9 @@ export class RedisCache implements IRedisCacheClient {
     const message = `Caching ${censoredKey}:${censoredValue} on ${callingMethod} for ${
       resolvedTtl > 0 ? `${resolvedTtl} ms` : 'indefinite time'
     }`;
-    this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(`${requestDetails.formattedRequestId} ${message}`);
+    }
     // TODO: add metrics
   }
 
@@ -204,9 +208,11 @@ export class RedisCache implements IRedisCacheClient {
 
     // Log the operation
     const entriesLength = Object.keys(keyValuePairs).length;
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} caching multiple keys via ${callingMethod}, total keys: ${entriesLength}`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} caching multiple keys via ${callingMethod}, total keys: ${entriesLength}`,
+      );
+    }
   }
 
   /**
@@ -239,9 +245,11 @@ export class RedisCache implements IRedisCacheClient {
 
     // Log the operation
     const entriesLength = Object.keys(keyValuePairs).length;
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} caching multiple keys via ${callingMethod}, total keys: ${entriesLength}`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} caching multiple keys via ${callingMethod}, total keys: ${entriesLength}`,
+      );
+    }
   }
 
   /**
@@ -255,7 +263,9 @@ export class RedisCache implements IRedisCacheClient {
   async delete(key: string, callingMethod: string, requestDetails: RequestDetails): Promise<void> {
     const client = await this.getConnectedClient();
     await client.del(key);
-    this.logger.trace(`${requestDetails.formattedRequestId} delete cache for ${key} on ${callingMethod} call`);
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(`${requestDetails.formattedRequestId} delete cache for ${key} on ${callingMethod} call`);
+    }
     // TODO: add metrics
   }
 
@@ -323,7 +333,11 @@ export class RedisCache implements IRedisCacheClient {
   async incrBy(key: string, amount: number, callingMethod: string, requestDetails: RequestDetails): Promise<number> {
     const client = await this.getConnectedClient();
     const result = await client.incrBy(key, amount);
-    this.logger.trace(`${requestDetails.formattedRequestId} incrementing ${key} by ${amount} on ${callingMethod} call`);
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} incrementing ${key} by ${amount} on ${callingMethod} call`,
+      );
+    }
     return result;
   }
 
@@ -346,9 +360,11 @@ export class RedisCache implements IRedisCacheClient {
   ): Promise<any[]> {
     const client = await this.getConnectedClient();
     const result = await client.lRange(key, start, end);
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} retrieving range [${start}:${end}] from ${key} on ${callingMethod} call`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} retrieving range [${start}:${end}] from ${key} on ${callingMethod} call`,
+      );
+    }
     return result.map((item) => JSON.parse(item));
   }
 
@@ -365,9 +381,11 @@ export class RedisCache implements IRedisCacheClient {
     const client = await this.getConnectedClient();
     const serializedValue = JSON.stringify(value);
     const result = await client.rPush(key, serializedValue);
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} pushing ${serializedValue} to ${key} on ${callingMethod} call`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} pushing ${serializedValue} to ${key} on ${callingMethod} call`,
+      );
+    }
     return result;
   }
 
@@ -381,9 +399,11 @@ export class RedisCache implements IRedisCacheClient {
   async keys(pattern: string, callingMethod: string, requestDetails: RequestDetails): Promise<string[]> {
     const client = await this.getConnectedClient();
     const result = await client.keys(pattern);
-    this.logger.trace(
-      `${requestDetails.formattedRequestId} retrieving keys matching ${pattern} on ${callingMethod} call`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${requestDetails.formattedRequestId} retrieving keys matching ${pattern} on ${callingMethod} call`,
+      );
+    }
     return result;
   }
 }
diff --git a/packages/relay/src/lib/clients/mirrorNodeClient.ts b/packages/relay/src/lib/clients/mirrorNodeClient.ts
@@ -228,7 +228,9 @@ export class MirrorNodeClient {
         const requestId = request ? request.split('\n')[3].substring(11, 47) : '';
         const requestIdPrefix = formatRequestIdMessage(requestId);
         const delay = isDevMode ? mirrorNodeRetryDelayDevMode || 200 : mirrorNodeRetryDelay * retryCount;
-        this.logger.trace(`${requestIdPrefix} Retry delay ${delay} ms on '${error?.request?.path}'`);
+        if (this.logger.isLevelEnabled('trace')) {
+          this.logger.trace(`${requestIdPrefix} Retry delay ${delay} ms on '${error?.request?.path}'`);
+        }
         return delay;
       },
       retryCondition: (error) => {
@@ -342,7 +344,9 @@ export class MirrorNodeClient {
       }
 
       const ms = Date.now() - start;
-      this.logger.debug(`${requestDetails.formattedRequestId} [${method}] ${path} ${response.status} ${ms} ms`);
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(`${requestDetails.formattedRequestId} [${method}] ${path} ${response.status} ${ms} ms`);
+      }
       this.mirrorResponseHistogram.labels(pathLabel, response.status?.toString()).observe(ms);
       return response.data;
     } catch (error: any) {
@@ -399,17 +403,21 @@ export class MirrorNodeClient {
     const acceptedErrorResponses = MirrorNodeClient.acceptedErrorStatusesResponsePerRequestPathMap.get(pathLabel);
 
     if (error.response && acceptedErrorResponses?.includes(effectiveStatusCode)) {
-      this.logger.debug(`${requestIdPrefix} [${method}] ${path} ${effectiveStatusCode} status`);
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(`${requestIdPrefix} [${method}] ${path} ${effectiveStatusCode} status`);
+      }
       return null;
     }
 
     // Contract Call returns 400 for a CONTRACT_REVERT but is a valid response, expected and should not be logged as error:
     if (pathLabel === MirrorNodeClient.CONTRACT_CALL_ENDPOINT && effectiveStatusCode === 400) {
-      this.logger.debug(
-        `${requestIdPrefix} [${method}] ${path} Contract Revert: ( StatusCode: '${effectiveStatusCode}', StatusText: '${
-          error.response.statusText
-        }', Detail: '${JSON.stringify(error.response.detail)}',Data: '${JSON.stringify(error.response.data)}')`,
-      );
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(
+          `${requestIdPrefix} [${method}] ${path} Contract Revert: ( StatusCode: '${effectiveStatusCode}', StatusText: '${
+            error.response.statusText
+          }', Detail: '${JSON.stringify(error.response.detail)}',Data: '${JSON.stringify(error.response.data)}')`,
+        );
+      }
     } else {
       this.logger.error(
         new Error(error.message),
@@ -437,9 +445,11 @@ export class MirrorNodeClient {
 
     if (page === pageMax) {
       // max page reached
-      this.logger.trace(
-        `${requestDetails.formattedRequestId} Max page reached ${pageMax} with ${results.length} results`,
-      );
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(
+          `${requestDetails.formattedRequestId} Max page reached ${pageMax} with ${results.length} results`,
+        );
+      }
       throw predefined.PAGINATION_MAX(pageMax);
     }
 
@@ -1282,11 +1292,13 @@ export class MirrorNodeClient {
         break;
       }
 
-      this.logger.trace(
-        `${requestDetails?.formattedRequestId} Repeating request ${methodName} with args ${JSON.stringify(
-          args,
-        )} retry count ${i} of ${repeatCount}. Waiting ${this.MIRROR_NODE_RETRY_DELAY} ms before repeating request`,
-      );
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(
+          `${requestDetails?.formattedRequestId} Repeating request ${methodName} with args ${JSON.stringify(
+            args,
+          )} retry count ${i} of ${repeatCount}. Waiting ${this.MIRROR_NODE_RETRY_DELAY} ms before repeating request`,
+        );
+      }
 
       // Backoff before repeating request
       await new Promise((r) => setTimeout(r, this.MIRROR_NODE_RETRY_DELAY));
@@ -1314,9 +1326,11 @@ export class MirrorNodeClient {
   ): Promise<ITransactionRecordMetric> {
     const formattedRequestId = requestDetails.formattedRequestId;
 
-    this.logger.trace(
-      `${formattedRequestId} Get transaction record via mirror node: transactionId=${transactionId}, txConstructorName=${txConstructorName}, callerName=${callerName}`,
-    );
+    if (this.logger.isLevelEnabled('trace')) {
+      this.logger.trace(
+        `${formattedRequestId} Get transaction record via mirror node: transactionId=${transactionId}, txConstructorName=${txConstructorName}, callerName=${callerName}`,
+      );
+    }
 
     const transactionRecords = await this.repeatedRequest(
       this.getTransactionById.name,

diff --git a/packages/relay/src/lib/clients/sdkClient.ts b/packages/relay/src/lib/clients/sdkClient.ts
@@ -539,9 +539,11 @@ export class SDKClient {
         const sdkClientError = new SDKClientError(e, e.message);
         if (sdkClientError.isTimeoutExceeded()) {
           const delay = retries * 1000;
-          this.logger.trace(
-            `${requestDetails.formattedRequestId} Contract call query failed with status ${sdkClientError.message}. Retrying again after ${delay} ms ...`,
-          );
+          if (this.logger.isLevelEnabled('trace')) {
+            this.logger.trace(
+              `${requestDetails.formattedRequestId} Contract call query failed with status ${sdkClientError.message}. Retrying again after ${delay} ms ...`,
+            );
+          }
           retries++;
           await new Promise((r) => setTimeout(r, delay));
           continue;
@@ -652,9 +654,11 @@ export class SDKClient {
         throw predefined.REQUEST_TIMEOUT;
       }
 
-      this.logger.debug(
-        `${requestIdPrefix} Fail to execute ${queryConstructorName} query: paymentTransactionId=${query.paymentTransactionId}, callerName=${callerName}, status=${sdkClientError.status}(${sdkClientError.status._code}), cost=${queryCost} tinybars`,
-      );
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(
+          `${requestIdPrefix} Fail to execute ${queryConstructorName} query: paymentTransactionId=${query.paymentTransactionId}, callerName=${callerName}, status=${sdkClientError.status}(${sdkClientError.status._code}), cost=${queryCost} tinybars`,
+        );
+      }
 
       throw sdkClientError;
     } finally {
@@ -895,9 +899,11 @@ export class SDKClient {
         this.logger.warn(`${requestDetails.formattedRequestId} File ${fileId} is empty.`);
         throw new SDKClientError({}, `${requestDetails.formattedRequestId} Created file is empty. `);
       }
-      this.logger.trace(
-        `${requestDetails.formattedRequestId} Created file with fileId: ${fileId} and file size ${fileInfo.size}`,
-      );
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(
+          `${requestDetails.formattedRequestId} Created file with fileId: ${fileId} and file size ${fileInfo.size}`,
+        );
+      }
     }
 
     return fileId;
@@ -945,7 +951,9 @@ export class SDKClient {
       );
 
       if (fileInfo.isDeleted) {
-        this.logger.trace(`${requestDetails.formattedRequestId} Deleted file with fileId: ${fileId}`);
+        if (this.logger.isLevelEnabled('trace')) {
+          this.logger.trace(`${requestDetails.formattedRequestId} Deleted file with fileId: ${fileId}`);
+        }
       } else {
         this.logger.warn(`${requestDetails.formattedRequestId} Fail to delete file with fileId: ${fileId} `);
       }
@@ -1000,9 +1008,11 @@ export class SDKClient {
     let transactionFee: number = 0;
     let txRecordChargeAmount: number = 0;
     try {
-      this.logger.trace(
-        `${requestDetails.formattedRequestId} Get transaction record via consensus node: transactionId=${transactionId}, txConstructorName=${txConstructorName}, callerName=${callerName}`,
-      );
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(
+          `${requestDetails.formattedRequestId} Get transaction record via consensus node: transactionId=${transactionId}, txConstructorName=${txConstructorName}, callerName=${callerName}`,
+        );
+      }
 
       const transactionRecord = await new TransactionRecordQuery()
         .setTransactionId(transactionId)

diff --git a/packages/relay/src/lib/config/hbarSpendingPlanConfigService.ts b/packages/relay/src/lib/config/hbarSpendingPlanConfigService.ts
@@ -108,7 +108,9 @@ export class HbarSpendingPlanConfigService {
   private loadSpendingPlansConfig(): SpendingPlanConfig[] {
     const configPath = findConfig(this.SPENDING_PLANS_CONFIG_FILE);
     if (!configPath || !fs.existsSync(configPath)) {
-      this.logger.trace(`Configuration file not found at path "${configPath ?? this.SPENDING_PLANS_CONFIG_FILE}"`);
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(`Configuration file not found at path "${configPath ?? this.SPENDING_PLANS_CONFIG_FILE}"`);
+      }
       return [];
     }
     try {
@@ -205,9 +207,11 @@ export class HbarSpendingPlanConfigService {
     requestDetails: RequestDetails,
   ): Promise<void> {
     for (const planConfig of spendingPlanConfigs) {
-      this.logger.trace(
-        `Updating associations for HBAR spending plan '${planConfig.name}' with ID ${planConfig.id}...`,
-      );
+      if (this.logger.isLevelEnabled('trace')) {
+        this.logger.trace(
+          `Updating associations for HBAR spending plan '${planConfig.name}' with ID ${planConfig.id}...`,
+        );
+      }
       await this.deleteObsoleteEthAddressAssociations(planConfig, requestDetails);
       await this.deleteObsoleteIpAddressAssociations(planConfig, requestDetails);
       await this.updateEthAddressAssociations(planConfig, requestDetails);