feat: added prometheus logs balances

Author: Tarens2

src/common/prometheus/prometheus.service.ts

@@ -35,10 +35,24 @@ export class PrometheusService {
     labelNames: ENV_KEYS,
   });
 
-  public validatorsState = this.getOrCreateMetric('Gauge', {
-    name: METRICS_PREFIX + 'validators_state',
-    help: 'balances of Lido validators with withdrawable_epoch by frames',
-    labelNames: ['frame', 'balance'],
+  public sumValidatorsBalances = this.getOrCreateMetric('Gauge', {
+    name: METRICS_PREFIX + 'sum_validators_balances',
+    help: 'sum balances of Lido validators with withdrawable_epoch',
+  });
+
+  public balancesStateUnfinalized = this.getOrCreateMetric('Gauge', {
+    name: METRICS_PREFIX + 'balances_state_unfinalized',
+    help: 'Unfinalized ETH balance',
+  });
+
+  public balancesStateBuffer = this.getOrCreateMetric('Gauge', {
+    name: METRICS_PREFIX + 'balances_state_buffer',
+    help: 'Buffer ETH balance',
+  });
+
+  public balancesStateVaults = this.getOrCreateMetric('Gauge', {
+    name: METRICS_PREFIX + 'balances_state_vaults',
+    help: 'Vaults ETH balance',
   });
 
   public clApiRequestDuration = this.getOrCreateMetric('Histogram', {

src/common/utils/to-eth.ts

@@ -0,0 +1,5 @@
+import { BigNumber } from '@ethersproject/bignumber';
+
+export const toEth = (bigNumberWei: BigNumber) => {
+  return bigNumberWei.div(BigNumber.from('1000000000000000000'));
+};

src/http/request-time/request-time.service.ts

@@ -1,6 +1,5 @@
 import { Inject, Injectable, LoggerService } from '@nestjs/common';
 
-import { BigNumber } from '@ethersproject/bignumber';
 import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
 import { parseEther } from '@ethersproject/units';
 
@@ -54,18 +53,8 @@ export class RequestTimeService {
     };
   }
 
-  async getRequestTimeV2({
-    amount,
-    cached,
-  }: {
-    amount: string;
-    cached?: {
-      unfinalized: BigNumber;
-      buffer: BigNumber;
-      vaultsBalance: BigNumber;
-    };
-  }): Promise<RequestTimeV2Dto | null> {
-    return await this.waitingTimeService.getWaitingTimeInfo({ amount, cached });
+  async getRequestTimeV2({ amount }: { amount: string }): Promise<RequestTimeV2Dto | null> {
+    return await this.waitingTimeService.getWaitingTimeInfo({ amount });
   }
 
   async getTimeRequests(requestOptions: RequestsTimeOptionsDto) {

src/jobs/validators/validators.service.ts

@@ -21,6 +21,7 @@ import { stringifyFrameBalances } from 'common/validators/strigify-frame-balance
 import { getValidatorWithdrawalTimestamp } from './utils/get-validator-withdrawal-timestamp';
 import { IndexedValidator, ResponseValidatorsData } from '../../common/consensus-provider/consensus-provider.types';
 import { SweepService } from '../../common/sweep';
+import { toEth } from '../../common/utils/to-eth';
 
 export class ValidatorsService {
   static SERVICE_LOG_NAME = 'validators';
@@ -198,7 +199,6 @@ export class ValidatorsService {
           );
 
           for (let j = 0; j < batch.length; j++) {
-            const validatorId = batch[j];
             const stateValidator = stateValidators[j];
 
             const withdrawalTimestamp = getValidatorWithdrawalTimestamp(
@@ -242,13 +242,10 @@ export class ValidatorsService {
       currentFrame,
     });
 
-    Object.keys(frameBalances).forEach((frame) => {
-      this.prometheusService.validatorsState
-        .labels({
-          frame,
-          balance: frameBalances[frame].toString(),
-        })
-        .inc();
-    });
+    const sum = Object.keys(frameBalances).reduce((acc, item) => {
+      return acc.add(frameBalances[item]);
+    }, BigNumber.from(0));
+
+    this.prometheusService.sumValidatorsBalances.set(toEth(sum).toNumber());
   }
 }

src/waiting-time/waiting-time.service.ts

@@ -11,6 +11,7 @@ import {
 } from 'storage';
 import { LOGGER_PROVIDER, LoggerService } from 'common/logger';
 import { GenesisTimeService, SECONDS_PER_SLOT, SLOTS_PER_EPOCH } from 'common/genesis-time';
+import { PrometheusService } from 'common/prometheus';
 import { RewardsService } from 'events/rewards';
 
 import {
@@ -38,6 +39,7 @@ import {
   GetWaitingTimeInfoV2Result,
 } from './waiting-time.types';
 import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
+import { toEth } from '../common/utils/to-eth';
 
 @Injectable()
 export class WaitingTimeService {
@@ -52,6 +54,7 @@ export class WaitingTimeService {
     protected readonly rewardsService: RewardsService,
     protected readonly queueInfo: QueueInfoStorageService,
     protected readonly provider: SimpleFallbackJsonRpcBatchProvider,
+    protected readonly prometheusService: PrometheusService,
   ) {}
 
   // preparing all needed number for calculation withdrawal time
@@ -307,6 +310,10 @@ export class WaitingTimeService {
       this.rewardsService.getVaultsBalance(blockNumber),
     ]);
 
+    this.prometheusService.balancesStateUnfinalized.set(toEth(unfinalized).toNumber());
+    this.prometheusService.balancesStateBuffer.set(toEth(buffer).toNumber());
+    this.prometheusService.balancesStateVaults.set(toEth(vaultsBalance).toNumber());
+
     return Promise.all(
       ids.map((requestId) => this.getWaitingTimeInfoById({ requestId, unfinalized, buffer, vaultsBalance })),
     );