diff --git a/src/counter.rs b/src/counter.rs index 31d61748e9..545be5a856 100644 --- a/src/counter.rs +++ b/src/counter.rs @@ -74,11 +74,12 @@ impl Counter { if times % lograte == 0 && times > 0 { let lastlog = self.lastlog.load(Ordering::Relaxed); info!( - "COUNTER:{{\"name\": \"{}\", \"counts\": {}, \"samples\": {}, \"now\": {}}}", + "COUNTER:{{\"name\": \"{}\", \"counts\": {}, \"samples\": {}, \"now\": {}, \"events\": {}}}", self.name, - counts, + counts + events, times, timing::timestamp(), + events, ); metrics::submit( influxdb::Point::new(&format!("counter-{}", self.name)) diff --git a/src/sigverify.rs b/src/sigverify.rs index 00fcd10d35..7b76ad0e31 100644 --- a/src/sigverify.rs +++ b/src/sigverify.rs @@ -98,7 +98,7 @@ pub fn ed25519_verify_cpu(batches: &[SharedPackets]) -> Vec> { .collect() }) .collect(); - inc_new_counter_info!("ed25519_verify", count); + inc_new_counter_info!("ed25519_verify_cpu", count); rv } @@ -117,7 +117,7 @@ pub fn ed25519_verify_disabled(batches: &[SharedPackets]) -> Vec> { .collect() }) .collect(); - inc_new_counter_info!("ed25519_verify", count); + inc_new_counter_info!("ed25519_verify_disabled", count); rv } @@ -204,7 +204,7 @@ pub fn ed25519_verify(batches: &[SharedPackets]) -> Vec> { num += 1; } } - inc_new_counter_info!("ed25519_verify", count); + inc_new_counter_info!("ed25519_verify_gpu", count); rvs }