From 531eb7df99c8bade27df5e7093f9e432a6efd89f Mon Sep 17 00:00:00 2001 From: rob thijssen Date: Sun, 14 Sep 2025 13:08:42 +0300 Subject: [PATCH] refine mining metrics to reduce redundancy and improve cleanup remove redundant estimated rate gauges and ensure all related job and thread metrics are cleaned up on job cancellation and completion. update GPU CUDA metrics to use backend-specific estimated rate. --- crates/engine-gpu-cuda/src/lib.rs | 3 +-- crates/miner-service/src/lib.rs | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/crates/engine-gpu-cuda/src/lib.rs b/crates/engine-gpu-cuda/src/lib.rs index 1cccf20..d10e3e6 100644 --- a/crates/engine-gpu-cuda/src/lib.rs +++ b/crates/engine-gpu-cuda/src/lib.rs @@ -643,8 +643,7 @@ impl CudaEngine { if kernel_ms > 0 { let attempts = active_threads * (effective_iters as u64); let rate = (attempts as f64) / ((kernel_ms as f64) / 1000.0); - let job_key = hex::encode(ctx.header); - metrics::job_estimated_rate("gpu-cuda", &job_key, rate); + metrics::job_estimated_rate_backend("gpu-cuda", "g2", rate); } } // Advance by covered window and continue to next batch, honoring cancel between batches diff --git a/crates/miner-service/src/lib.rs b/crates/miner-service/src/lib.rs index ecf5a50..15a8570 100644 --- a/crates/miner-service/src/lib.rs +++ b/crates/miner-service/src/lib.rs @@ -130,8 +130,6 @@ impl MiningService { metrics::set_job_status_gauge(self.engine.name(), &job_id, "completed", 0); metrics::set_job_status_gauge(self.engine.name(), &job_id, "failed", 0); metrics::set_job_status_gauge(self.engine.name(), &job_id, "cancelled", 0); - // initialize estimated rate gauge so it appears immediately - metrics::set_job_estimated_rate(self.engine.name(), &job_id, 0.0); // increment active jobs { let mut g = self.active_jobs_gauge.lock().await; @@ -210,11 +208,6 @@ impl MiningService { running_jobs += 1; total_rate += job.last_hash_rate; metrics::set_job_hash_rate(job.engine_name, job_id, job.last_hash_rate); - metrics::set_job_estimated_rate( - job.engine_name, - job_id, - job.last_hash_rate, - ); } } metrics::set_hash_rate(total_rate); @@ -393,6 +386,8 @@ impl MiningJob { // Remove job hash rate series on cancellation (avoid scrape-timing artifacts) self.last_hash_rate = 0.0; metrics::remove_job_hash_rate(self.engine_name, job_id); + metrics::remove_job_metrics(self.engine_name, job_id); + metrics::remove_thread_metrics_for_job(self.engine_name, job_id); // Remove all per-thread hash rate series on cancellation and clear tracking for (tid, _) in self.thread_rate_ema.iter() { metrics::remove_thread_hash_rate(self.engine_name, job_id, &tid.to_string()); @@ -460,7 +455,6 @@ impl MiningJob { let job_rate: f64 = self.thread_rate_ema.values().copied().sum(); self.last_hash_rate = job_rate; metrics::set_job_hash_rate(self.engine_name, job_id, job_rate); - metrics::set_job_estimated_rate(self.engine_name, job_id, job_rate); } } @@ -518,6 +512,8 @@ impl MiningJob { // Remove job hash rate on completion and clear per-thread series self.last_hash_rate = 0.0; metrics::remove_job_hash_rate(self.engine_name, job_id); + metrics::remove_job_metrics(self.engine_name, job_id); + metrics::remove_thread_metrics_for_job(self.engine_name, job_id); for (tid, _) in self.thread_rate_ema.iter() { metrics::remove_thread_hash_rate( self.engine_name,