feat: integrated HbarLimitService instance into MetricService class

Signed-off-by: Logan Nguyen <logan.nguyen@swirldslabs.com>
hashgraph · Sep 30, 2024 · f8c554e · f8c554e
1 parent b8d83c2
commit f8c554e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/packages/relay/src/lib/relay.ts b/packages/relay/src/lib/relay.ts
@@ -173,6 +173,7 @@ export class RelayImpl implements Relay {
       hbarLimiter,
       register,
       this.eventEmitter,
+      hbarLimitService,
     );
 
     this.ethImpl = new EthImpl(

diff --git a/packages/relay/src/lib/services/metricService/metricService.ts b/packages/relay/src/lib/services/metricService/metricService.ts
@@ -26,6 +26,7 @@ import { Histogram, Registry } from 'prom-client';
 import { MirrorNodeClient, SDKClient } from '../../clients';
 import { formatRequestIdMessage } from '../../../formatters';
 import { ITransactionRecordMetric, IExecuteQueryEventPayload, IExecuteTransactionEventPayload } from '../../types';
+import { HbarLimitService } from '../hbarLimitService';
 
 export default class MetricService {
   /**
@@ -85,6 +86,14 @@ export default class MetricService {
    */
   private readonly eventEmitter: EventEmitter;
 
+  /**
+   * An instance of the HbarLimitService that tracks hbar expenses and limits.
+   * @private
+   * @readonly
+   * @type {HbarLimitService}
+   */
+  private readonly hbarLimitService: HbarLimitService;
+
   /**
    * Constructs an instance of the MetricService responsible for tracking and recording various metrics
    * related to Hedera network interactions and resource usage.
@@ -103,12 +112,14 @@ export default class MetricService {
     hbarLimiter: HbarLimit,
     register: Registry,
     eventEmitter: EventEmitter,
+    hbarLimitService: HbarLimitService,
   ) {
     this.logger = logger;
     this.sdkClient = sdkClient;
     this.hbarLimiter = hbarLimiter;
     this.eventEmitter = eventEmitter;
     this.mirrorNodeClient = mirrorNodeClient;
+    this.hbarLimitService = hbarLimitService;
     this.consensusNodeClientHistogramCost = this.initCostMetric(register);
     this.consensusNodeClientHistogramGasFee = this.initGasMetric(register);
 

diff --git a/packages/relay/tests/lib/sdkClient.spec.ts b/packages/relay/tests/lib/sdkClient.spec.ts
@@ -158,7 +158,15 @@ describe('SdkClient', async function () {
       instance,
     );
 
-    metricService = new MetricService(logger, sdkClient, mirrorNodeClient, hbarLimiter, registry, eventEmitter);
+    metricService = new MetricService(
+      logger,
+      sdkClient,
+      mirrorNodeClient,
+      hbarLimiter,
+      registry,
+      eventEmitter,
+      hbarLimitService,
+    );
   });
 
   beforeEach(() => {

diff --git a/packages/relay/tests/lib/services/metricService/metricService.spec.ts b/packages/relay/tests/lib/services/metricService/metricService.spec.ts
@@ -163,7 +163,15 @@ describe('Metric Service', function () {
       hbarLimitService,
     );
     // Init new MetricService instance
-    metricService = new MetricService(logger, sdkClient, mirrorNodeClient, hbarLimiter, registry, eventEmitter);
+    metricService = new MetricService(
+      logger,
+      sdkClient,
+      mirrorNodeClient,
+      hbarLimiter,
+      registry,
+      eventEmitter,
+      hbarLimitService,
+    );
   });
 
   afterEach(() => {