Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove the collection of worklock events, feels like they are irrelevant at this time.

pull/2376/head
derekpierre 2020-10-16 13:36:03 -04:00
parent e27f7ef482
commit b01079ac22
2 changed files with 1 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
nucypher/utilities/prometheus/collector.py
View File

@ -432,65 +432,3 @@ class WorkerBondedEventMetricsCollector(EventMetricsCollector):
super()._event_occurred(event)
self.metrics["current_worker_is_me_gauge"].set(
self.contract_agent.get_worker_from_staker(self.staker_address) == self.worker_address)
class BidRefundCompositeEventMetricsCollector(MetricsCollector):
"""
Collector for both Bid and Refund WorkLock events.
Both Bid and Refund events additionally update the same metric of how much eth is deposited by the staker
so they are combined into one overall collector.
"""
COMMON_METRIC_KEY = "worklock_deposited_eth_gauge"
class BidRefundCommonCollector(EventMetricsCollector):
"""Configurable and generalized event metric collector applicable to both Bid and Refund events."""
def __init__(self, staker_address: ChecksumAddress, *args, **kwargs):
super().__init__(*args, **kwargs)
self.staker_address = staker_address
def add_common_metric(self, metric: MetricWrapperBase):
self.metrics[BidRefundCompositeEventMetricsCollector.COMMON_METRIC_KEY] = metric
def _event_occurred(self, event) -> None:
super()._event_occurred(event)
self.metrics[BidRefundCompositeEventMetricsCollector.COMMON_METRIC_KEY].set(
self.contract_agent.get_deposited_eth(self.staker_address))
def __init__(self, staker_address: ChecksumAddress, contract_registry: BaseContractRegistry, metrics_prefix: str):
# Bid/Refund (Modify the same metric)
worklock_agent = ContractAgency.get_agent(WorkLockAgent, registry=contract_registry)
self.collectors: List[BidRefundCompositeEventMetricsCollector.BidRefundCommonCollector] = [
# Bid Events
self.BidRefundCommonCollector(
event_name='Bid',
event_args_config={
"depositedETH": (Gauge, f'{metrics_prefix}_worklock_bid_depositedETH', 'Deposited ETH value')
},
argument_filters={"sender": staker_address},
staker_address=staker_address,
contract_agent=worklock_agent),
# Refund Events
self.BidRefundCommonCollector(
event_name='Refund',
event_args_config={
"refundETH": (Gauge, f'{metrics_prefix}_worklock_refund_refundETH', 'Refunded ETH')
},
argument_filters={"sender": staker_address},
staker_address=staker_address,
contract_agent=worklock_agent)
]
def initialize(self, metrics_prefix: str, registry: CollectorRegistry) -> None:
common_gauge = Gauge(f'{metrics_prefix}_worklock_current_deposited_eth',
'Worklock deposited ETH',
registry=registry)
for collector in self.collectors:
collector.initialize(metrics_prefix, registry)
# manually add common gauge to both collectors' dictionary of metrics
collector.add_common_metric(common_gauge)
def collect(self) -> None:
for collector in self.collectors:
collector.collect()

41
nucypher/utilities/prometheus/metrics.py
View File

@ -41,7 +41,6 @@ from nucypher.utilities.prometheus.collector import (
ReStakeEventMetricsCollector,
WindDownEventMetricsCollector,
WorkerBondedEventMetricsCollector,
BidRefundCompositeEventMetricsCollector,
CommitmentMadeEventMetricsCollector)
from typing import List
@ -49,7 +48,7 @@ from typing import List
from twisted.internet import reactor, task
from twisted.web.resource import Resource
from nucypher.blockchain.eth.agents import ContractAgency, StakingEscrowAgent, WorkLockAgent, PolicyManagerAgent
from nucypher.blockchain.eth.agents import ContractAgency, StakingEscrowAgent, PolicyManagerAgent
class PrometheusMetricsConfig:
@ -206,11 +205,6 @@ def create_metrics_collectors(ursula: 'Ursula', metrics_prefix: str) -> List[Met
metrics_prefix=metrics_prefix)
collectors.extend(staking_events_collectors)
# WorkLock Events
worklock_events_collectors = create_worklock_events_metric_collectors(ursula=ursula,
metrics_prefix=metrics_prefix)
collectors.extend(worklock_events_collectors)
# Policy Events
policy_events_collectors = create_policy_events_metric_collectors(ursula=ursula,
metrics_prefix=metrics_prefix)
@ -289,39 +283,6 @@ def create_staking_events_metric_collectors(ursula: 'Ursula', metrics_prefix: st
return collectors
def create_worklock_events_metric_collectors(ursula: 'Ursula', metrics_prefix: str) -> List[MetricsCollector]:
"""Create collectors for worklock-related events."""
collectors: List[MetricsCollector] = []
worklock_agent = ContractAgency.get_agent(WorkLockAgent, registry=ursula.registry)
staker_address = ursula.checksum_address
# Deposited\
collectors.append(EventMetricsCollector(
event_name='Deposited',
event_args_config={
"value": (Gauge, f'{metrics_prefix}_worklock_deposited_value', 'Deposited value')
},
argument_filters={"sender": staker_address},
contract_agent=worklock_agent))
# Claimed
collectors.append(EventMetricsCollector(
event_name='Claimed',
event_args_config={
"claimedTokens": (Gauge, f'{metrics_prefix}_worklock_claimed_claimedTokens', 'Claimed tokens value')
},
argument_filters={"sender": staker_address},
contract_agent=worklock_agent))
# Bid/Refund (Modify a common metric)
collectors.append(BidRefundCompositeEventMetricsCollector(
staker_address=staker_address,
contract_registry=ursula.registry,
metrics_prefix=metrics_prefix))
return collectors
def create_policy_events_metric_collectors(ursula: 'Ursula', metrics_prefix: str) -> List[MetricsCollector]:
"""Create collectors for policy-related events."""
collectors: List[MetricsCollector] = []