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.

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

Jump to bottom

feat: improved load-test-metrics #3717

Merged
merged 1 commit into from Nov 26, 2023
Merged

feat: improved load-test-metrics #3717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions devimint/src/main.rs
View file
Open in desktop
Expand Up @@ -935,6 +935,10 @@ async fn run_ln_circular_load_test(load_test_temp: &Path, invite_code: &str) ->
output.contains("gateway_pay_invoice_success"),
"missing invoice payment"
);
anyhow::ensure!(
output.contains("gateway_payment_received_success"),
"missing received payment"
);

info!("Testing ln-circular-load-test with 'partner-ping-pong' strategy");
// Note invite code isn't required because we already have an archive dir
Expand All @@ -958,8 +962,8 @@ async fn run_ln_circular_load_test(load_test_temp: &Path, invite_code: &str) ->
"missing invoice creation"
);
anyhow::ensure!(
output.contains("gateway_pay_invoice_success"),
"missing invoice payment"
output.contains("gateway_payment_received_success"),
"missing received payment"
);

info!("Testing ln-circular-load-test with 'self-payment' strategy");
Expand All @@ -984,8 +988,8 @@ async fn run_ln_circular_load_test(load_test_temp: &Path, invite_code: &str) ->
"missing invoice creation"
);
anyhow::ensure!(
output.contains("gateway_pay_invoice_success"),
"missing invoice payment"
output.contains("gateway_payment_received_success"),
"missing received payment"
);
Ok(())
}
Expand Down
5 changes: 5 additions & 0 deletions fedimint-load-test-tool/src/common.rs
View file
Open in desktop
Expand Up @@ -222,6 +222,7 @@ pub async fn lnd_wait_invoice_payment(r_hash: String) -> anyhow::Result<()> {

pub async fn gateway_pay_invoice(
prefix: &str,
gateway_name: &str,
client: &ClientArc,
invoice: Bolt11Invoice,
event_sender: &mpsc::UnboundedSender<MetricEvent>,
Expand Down Expand Up @@ -251,6 +252,10 @@ pub async fn gateway_pay_invoice(
name: "gateway_pay_invoice_success".into(),
duration: elapsed,
})?;
event_sender.send(MetricEvent {
name: format!("gateway_{gateway_name}_pay_invoice_success"),
duration: elapsed,
})?;
break;
}
LnPayState::Created | LnPayState::Funded | LnPayState::AwaitingChange => {}
Expand Down
39 changes: 20 additions & 19 deletions fedimint-load-test-tool/src/main.rs
View file
Open in desktop
@@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
use std::path::PathBuf;
use std::str::FromStr;
use std::sync::Arc;
Expand Down Expand Up @@ -646,12 +646,12 @@ async fn do_load_test_user_task(
match generate_invoice_with {
Some(LnInvoiceGeneration::ClnLightningCli) => {
let (invoice, label) = cln_create_invoice(invoice_amount).await?;
gateway_pay_invoice(&prefix, &client, invoice, &event_sender).await?;
gateway_pay_invoice(&prefix, "LND", &client, invoice, &event_sender).await?;
cln_wait_invoice_payment(&label).await?;
}
Some(LnInvoiceGeneration::LnCli) => {
let (invoice, r_hash) = lnd_create_invoice(invoice_amount).await?;
gateway_pay_invoice(&prefix, &client, invoice, &event_sender).await?;
gateway_pay_invoice(&prefix, "CLN", &client, invoice, &event_sender).await?;
lnd_wait_invoice_payment(r_hash).await?;
}
None if additional_invoices.is_empty() => {
Expand All @@ -678,7 +678,7 @@ async fn do_load_test_user_task(
} else if invoice_amount == Amount::ZERO {
warn!("Can't pay invoice {invoice}, amount is zero");
} else {
gateway_pay_invoice(&prefix, &client, invoice, &event_sender).await?;
gateway_pay_invoice(&prefix, "unknown", &client, invoice, &event_sender).await?;
if additional_invoices.peek().is_some() {
// Only sleep while there are more invoices to pay
fedimint_core::task::sleep(ln_payment_sleep).await;
Expand Down Expand Up @@ -836,15 +836,15 @@ async fn run_two_gateways_strategy(
name: GATEWAY_CREATE_INVOICE.into(),
duration: elapsed,
})?;
gateway_pay_invoice(prefix, client, invoice, event_sender).await?;
gateway_pay_invoice(prefix, "LND", client, invoice, event_sender).await?;
cln_wait_invoice_payment(&label).await?;
let (operation_id, invoice) =
client_create_invoice(client, *invoice_amount, event_sender).await?;
let pay_invoice_time = fedimint_core::time::now();
cln_pay_invoice(invoice).await?;
wait_invoice_payment(
prefix,
"CLN",
"LND",
client,
operation_id,
event_sender,
Expand All @@ -861,15 +861,15 @@ async fn run_two_gateways_strategy(
name: GATEWAY_CREATE_INVOICE.into(),
duration: elapsed,
})?;
gateway_pay_invoice(prefix, client, invoice, event_sender).await?;
gateway_pay_invoice(prefix, "CLN", client, invoice, event_sender).await?;
lnd_wait_invoice_payment(r_hash).await?;
let (operation_id, invoice) =
client_create_invoice(client, *invoice_amount, event_sender).await?;
let pay_invoice_time = fedimint_core::time::now();
lnd_pay_invoice(invoice).await?;
wait_invoice_payment(
prefix,
"LND",
"CLN",
client,
operation_id,
event_sender,
Expand Down Expand Up @@ -949,16 +949,16 @@ async fn do_partner_ping_pong(

async fn wait_invoice_payment(
prefix: &str,
method: &str,
gateway_name: &str,
client: &ClientArc,
operation_id: fedimint_core::core::OperationId,
event_sender: &mpsc::UnboundedSender<MetricEvent>,
pay_invoice_time: std::time::SystemTime,
) -> anyhow::Result<()> {
let elapsed = pay_invoice_time.elapsed()?;
info!("{prefix} Invoice payment received started using {method} in {elapsed:?}");
info!("{prefix} Invoice payment receive started using {gateway_name} in {elapsed:?}");
event_sender.send(MetricEvent {
name: format!("gateway_payment_received_started_{method}"),
name: format!("gateway_{gateway_name}_payment_received_started"),
duration: elapsed,
})?;
let lightning_module = client.get_first_module::<LightningClientModule>();
Expand All @@ -971,18 +971,22 @@ async fn wait_invoice_payment(
match update {
LnReceiveState::Claimed => {
let elapsed: Duration = pay_invoice_time.elapsed()?;
info!("{prefix} Invoice payment using {method} received in {elapsed:?}");
info!("{prefix} Invoice payment received on {gateway_name} in {elapsed:?}");
event_sender.send(MetricEvent {
name: "gateway_payment_received_success".into(),
duration: elapsed,
})?;
event_sender.send(MetricEvent {
name: "gateway_pay_invoice_success".into(),
name: format!("gateway_{gateway_name}_payment_received_success"),
duration: elapsed,
})?;
break;
}
LnReceiveState::Canceled { reason } => {
let elapsed: Duration = pay_invoice_time.elapsed()?;
warn!("{prefix} Invoice using {method} was canceled: {reason} in {elapsed:?}");
info!("{prefix} Invoice payment receive was canceled on {gateway_name}: {reason} in {elapsed:?}");
event_sender.send(MetricEvent {
name: "gateway_pay_invoice_canceled".into(),
name: "gateway_payment_received_canceled".into(),
duration: elapsed,
})?;
break;
Expand Down Expand Up @@ -1191,18 +1195,15 @@ async fn handle_metrics_summary(
.await?,
))
}

let mut results = HashMap::new();
let mut results = BTreeMap::new();
while let Some(event) = event_receiver.recv().await {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx! The ordering being inconsistent was quite annoying xD

let entry = results.entry(event.name).or_insert_with(Vec::new);
entry.push(event.duration);
}

let mut previous_metrics = previous_metrics
.into_iter()
.map(|metric| (metric.name.clone(), metric))
.collect::<HashMap<_, _>>();

for (k, mut v) in results {
v.sort();
let n = v.len();
Expand Down