Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add network label #453

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/commands/start_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ async def start_base() -> None:
logger.info('Starting api mode')

logger.info('Started operator service')
metrics.service_started.set(1)
metrics.service_started.labels(network=settings.network).set(1)
with InterruptHandler() as interrupt_handler:
tasks = [
ValidatorsTask(
Expand Down
2 changes: 1 addition & 1 deletion src/common/execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ async def check_hot_wallet_balance() -> None:

hot_wallet_balance = await get_hot_wallet_balance()

metrics.wallet_balance.set(hot_wallet_balance)
metrics.wallet_balance.labels(network=settings.network).set(hot_wallet_balance)

if hot_wallet_balance < hot_wallet_min_balance:
logger.warning(
Expand Down
36 changes: 28 additions & 8 deletions src/common/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,56 @@
class Metrics:
def __init__(self) -> None:
self.app_version = Info(
'app_version', 'V3 Operator version', namespace=settings.metrics_prefix
'app_version',
'V3 Operator version',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.service_started = Gauge(
'service_started',
'Is service ready to register validators',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.block_number = Gauge(
'block_number', 'Current block number', namespace=settings.metrics_prefix
'block_number',
'Current block number',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.slot_number = Gauge(
'slot_number', 'Current slot number', namespace=settings.metrics_prefix
'slot_number',
'Current slot number',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.wallet_balance = Gauge(
'wallet_balance', 'Current wallet balance', namespace=settings.metrics_prefix
'wallet_balance',
'Current wallet balance',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.outdated_signatures = Gauge(
'outdated_signatures',
'The number of outdated signatures',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.stakeable_assets = Gauge(
'stakeable_assets', 'The amount of stakeable assets', namespace=settings.metrics_prefix
'stakeable_assets',
'The amount of stakeable assets',
namespace=settings.metrics_prefix,
labelnames=['network'],
)
self.unused_validator_keys = Gauge(
'unused_validator_keys',
'The number of unused validator keys in deposit data file',
namespace=settings.metrics_prefix,
labelnames=['network'],
)

def set_app_version(self) -> None:
self.app_version.info({'version': src.__version__})
self.app_version.labels(network=settings.network).info({'version': src.__version__})


class LazyMetrics:
Expand Down Expand Up @@ -75,5 +93,7 @@ async def process_block(self, interrupt_handler: InterruptHandler) -> None:
metrics.set_app_version()

chain_state = await get_chain_finalized_head()
metrics.block_number.set(await execution_client.eth.get_block_number())
metrics.slot_number.set(chain_state.slot)
latest_block_number = await execution_client.eth.get_block_number()

metrics.block_number.labels(network=settings.network).set(latest_block_number)
metrics.slot_number.labels(network=settings.network).set(chain_state.slot)
2 changes: 1 addition & 1 deletion src/exits/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ async def _fetch_outdated_indexes(
continue
if not update_block or response['exit_signature_block_number'] >= update_block:
outdated_indexes = [val['index'] for val in response['validators']]
metrics.outdated_signatures.set(len(outdated_indexes))
metrics.outdated_signatures.labels(network=settings.network).set(len(outdated_indexes))
return outdated_indexes
raise RuntimeError('Oracles are down or have not synced exit signatures yet')

Expand Down
5 changes: 3 additions & 2 deletions src/validators/metrics.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from src.common.metrics import metrics
from src.config.settings import settings
from src.validators.database import NetworkValidatorCrud
from src.validators.execution import check_deposit_data_root
from src.validators.keystores.base import BaseKeystore
Expand All @@ -12,7 +13,7 @@ async def update_unused_validator_keys_metric(
try:
await check_deposit_data_root(deposit_data.tree.root)
except RuntimeError:
metrics.unused_validator_keys.set(0)
metrics.unused_validator_keys.labels(network=settings.network).set(0)
return 0

validators: int = 0
Expand All @@ -24,6 +25,6 @@ async def update_unused_validator_keys_metric(
continue
validators += 1

metrics.unused_validator_keys.set(validators)
metrics.unused_validator_keys.labels(network=settings.network).set(validators)

return validators
2 changes: 1 addition & 1 deletion src/validators/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ async def get_validators_count_from_vault_assets(harvest_params: HarvestParams |
# apply GNO -> mGNO exchange rate
vault_balance = convert_to_mgno(vault_balance)

metrics.stakeable_assets.set(int(vault_balance))
metrics.stakeable_assets.labels(network=settings.network).set(int(vault_balance))

# calculate number of validators that can be registered
validators_count = vault_balance // DEPOSIT_AMOUNT
Expand Down
Loading