Skip to content

feat(fortuna): Track amount spent on tx fees #2245

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jan 13, 2025
Merged

feat(fortuna): Track amount spent on tx fees #2245

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a840680
track amount spent on tx fees
jayantk Jan 13, 2025
1d4db65
comment
jayantk Jan 13, 2025
04da32e
Merge branch 'main' into fortuna_gas_fees
jayantk Jan 13, 2025
82ca290
bump version
jayantk Jan 13, 2025
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
45 changes: 26 additions & 19 deletions apps/fortuna/src/keeper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub struct KeeperMetrics {
pub collected_fee: Family<AccountLabel, Gauge<f64, AtomicU64>>,
pub current_fee: Family<AccountLabel, Gauge<f64, AtomicU64>>,
pub total_gas_spent: Family<AccountLabel, Gauge<f64, AtomicU64>>,
pub total_gas_fee_spent: Family<AccountLabel, Gauge<f64, AtomicU64>>,
pub requests: Family<AccountLabel, Counter>,
pub requests_processed: Family<AccountLabel, Counter>,
pub requests_processed_success: Family<AccountLabel, Counter>,
Expand All @@ -89,6 +90,7 @@ impl Default for KeeperMetrics {
collected_fee: Family::default(),
current_fee: Family::default(),
total_gas_spent: Family::default(),
total_gas_fee_spent: Family::default(),
requests: Family::default(),
requests_processed: Family::default(),
requests_processed_success: Family::default(),
Expand Down Expand Up @@ -179,6 +181,12 @@ impl KeeperMetrics {
keeper_metrics.total_gas_spent.clone(),
);

writable_registry.register(
"total_gas_fee_spent",
"Total amount of ETH spent on gas for revealing requests",
keeper_metrics.total_gas_fee_spent.clone(),
);

writable_registry.register(
"requests_reprocessed",
"Number of requests reprocessed",
Expand Down Expand Up @@ -471,6 +479,7 @@ pub async fn process_event_with_backoff(
.contract
.get_request(event.provider_address, event.sequence_number)
.await;

tracing::error!("Failed to process event: {:?}. Request: {:?}", e, req);

// We only count failures for cases where we are completely certain that the callback failed.
Expand Down Expand Up @@ -618,30 +627,28 @@ pub async fn process_event(
receipt
);

let account_label = AccountLabel {
chain_id: chain_config.id.clone(),
address: chain_config.provider_address.to_string(),
};

if let Some(gas_used) = receipt.gas_used {
let gas_used = gas_used.as_u128() as f64 / 1e18;
let gas_used_float = gas_used.as_u128() as f64 / 1e18;
metrics
.total_gas_spent
.get_or_create(&AccountLabel {
chain_id: chain_config.id.clone(),
address: client
.inner()
.inner()
.inner()
.signer()
.address()
.to_string(),
})
.inc_by(gas_used);
.get_or_create(&account_label)
.inc_by(gas_used_float);

if let Some(gas_price) = receipt.effective_gas_price {
let gas_fee = (gas_used * gas_price).as_u128() as f64 / 1e18;
metrics
.total_gas_fee_spent
.get_or_create(&account_label)
.inc_by(gas_fee);
}
}

metrics
.reveals
.get_or_create(&AccountLabel {
chain_id: chain_config.id.clone(),
address: chain_config.provider_address.to_string(),
})
.inc();
metrics.reveals.get_or_create(&account_label).inc();

Ok(())
}
Expand Down
Loading