hugo/DS4Server
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix issue #2 - telemetry not showing in graphs

Browse Source
This commit is contained in:
Georg Bauer
2026-07-25 10:52:56 +02:00
parent 19fe61fc21
commit 7843592400
3 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app.rs
View File

@@ -422,8 +422,6 @@ pub(crate) struct App {
pub(super) metrics_snapshot: MetricsSnapshot,
pub(super) metrics_history: VecDeque<MetricsPoint>,
last_http_requests: u64,
last_kv_read_bytes: u64,
last_kv_write_bytes: u64,
#[cfg(target_os = "macos")]
generation_service: Option<GenerationService>,
#[cfg(target_os = "macos")]
@@ -650,8 +648,6 @@ impl App {
metrics_snapshot,
metrics_history: VecDeque::with_capacity(120),
last_http_requests: 0,
last_kv_read_bytes: 0,
last_kv_write_bytes: 0,
#[cfg(target_os = "macos")]
generation_service,
#[cfg(target_os = "macos")]
@@ -723,8 +719,6 @@ impl App {
metrics_snapshot,
metrics_history: VecDeque::with_capacity(120),
last_http_requests: 0,
last_kv_read_bytes: 0,
last_kv_write_bytes: 0,
#[cfg(target_os = "macos")]
generation_service,
#[cfg(target_os = "macos")]
@@ -1787,23 +1781,17 @@ impl App {
}
fn sample_metrics(&mut self) {
let prefill_tokens_per_second = self.metrics.take_prefill_sample();
let (kv_read_bytes, kv_write_bytes) = self.metrics.take_kv_io_sample();
let snapshot = self.metrics.snapshot();
let http_requests_per_second = snapshot
.http_requests
.saturating_sub(self.last_http_requests) as f32
/ METRICS_SAMPLE_INTERVAL.as_secs_f32();
let kv_read_bytes_per_second = snapshot
.kv_read_bytes
.saturating_sub(self.last_kv_read_bytes) as f32
/ METRICS_SAMPLE_INTERVAL.as_secs_f32();
let kv_write_bytes_per_second = snapshot
.kv_write_bytes
.saturating_sub(self.last_kv_write_bytes)
as f32
/ METRICS_SAMPLE_INTERVAL.as_secs_f32();
let kv_read_bytes_per_second = kv_read_bytes as f32 / METRICS_SAMPLE_INTERVAL.as_secs_f32();
let kv_write_bytes_per_second =
kv_write_bytes as f32 / METRICS_SAMPLE_INTERVAL.as_secs_f32();
self.last_http_requests = snapshot.http_requests;
self.last_kv_read_bytes = snapshot.kv_read_bytes;
self.last_kv_write_bytes = snapshot.kv_write_bytes;
self.metrics_history.push_back(MetricsPoint {
decode_tokens_per_second: if snapshot.phase == crate::metrics::RuntimePhase::Generating
{
@@ -1811,12 +1799,7 @@ impl App {
} else {
0.0
},
prefill_tokens_per_second: if snapshot.phase == crate::metrics::RuntimePhase::Prefilling
{
snapshot.prefill_tokens_per_second
} else {
0.0
},
prefill_tokens_per_second,
http_requests_per_second,
kv_read_bytes_per_second,
kv_write_bytes_per_second,

8
src/app/view.rs
View File

@@ -598,9 +598,9 @@ impl App {
),
row![
text(if stats.kv_read_active {
"Read · active"
"Disk read · active"
} else {
"Read"
"Disk read"
})
.size(12)
.color(Color::from_rgb8(67, 194, 203)),
@@ -616,9 +616,9 @@ impl App {
),
row![
text(if stats.kv_write_active {
"Write · active"
"Disk write · active"
} else {
"Write"
"Disk write"
})
.size(12)
.color(Color::from_rgb8(240, 180, 70)),

28
src/metrics.rs
View File

@@ -145,6 +145,7 @@ pub(crate) struct Metrics {
context_limit: AtomicU32,
decode_tps: AtomicU32,
prefill_tps: AtomicU32,
prefill_sample: AtomicU32,
last_runtime_ms: AtomicU64,
total_runtime_ms: AtomicU64,
last_prompt_tokens: AtomicU64,
@@ -169,6 +170,8 @@ pub(crate) struct Metrics {
kv_write_errors: AtomicU64,
kv_read_bytes: AtomicU64,
kv_write_bytes: AtomicU64,
kv_read_sample_bytes: AtomicU64,
kv_write_sample_bytes: AtomicU64,
last_kv_read_ms: AtomicU64,
last_kv_write_ms: AtomicU64,
kv_files: AtomicU64,
@@ -215,6 +218,7 @@ impl Metrics {
context_limit: AtomicU32::new(0),
decode_tps: AtomicU32::new(0),
prefill_tps: AtomicU32::new(0),
prefill_sample: AtomicU32::new(0),
last_runtime_ms: AtomicU64::new(0),
total_runtime_ms: AtomicU64::new(0),
last_prompt_tokens: AtomicU64::new(0),
@@ -239,6 +243,8 @@ impl Metrics {
kv_write_errors: AtomicU64::new(0),
kv_read_bytes: AtomicU64::new(0),
kv_write_bytes: AtomicU64::new(0),
kv_read_sample_bytes: AtomicU64::new(0),
kv_write_sample_bytes: AtomicU64::new(0),
last_kv_read_ms: AtomicU64::new(0),
last_kv_write_ms: AtomicU64::new(0),
kv_files: AtomicU64::new(cache.files),
@@ -282,6 +288,7 @@ impl Metrics {
self.source.store(source as u8, Ordering::Relaxed);
self.decode_tps.store(0, Ordering::Relaxed);
self.prefill_tps.store(0, Ordering::Relaxed);
self.prefill_sample.store(0, Ordering::Relaxed);
}
pub(crate) fn loading(&self) {
@@ -313,6 +320,7 @@ impl Metrics {
self.context_used.store(used, Ordering::Relaxed);
self.context_limit.store(limit, Ordering::Relaxed);
store_f32(&self.prefill_tps, speed);
store_f32(&self.prefill_sample, speed);
}
pub(crate) fn generation_progress(&self, used: u32, limit: u32, speed: f32) {
@@ -376,6 +384,7 @@ impl Metrics {
self.context_used.store(0, Ordering::Relaxed);
self.decode_tps.store(0, Ordering::Relaxed);
self.prefill_tps.store(0, Ordering::Relaxed);
self.prefill_sample.store(0, Ordering::Relaxed);
self.model_unloads.fetch_add(1, Ordering::Relaxed);
}
@@ -418,6 +427,8 @@ impl Metrics {
pub(crate) fn kv_read_bytes(&self, bytes: u64) {
self.kv_read_bytes.fetch_add(bytes, Ordering::Relaxed);
self.kv_read_sample_bytes
.fetch_add(bytes, Ordering::Relaxed);
}
pub(crate) fn kv_read_finished(&self, elapsed: Duration, failed: bool) {
@@ -436,6 +447,8 @@ impl Metrics {
pub(crate) fn kv_write_bytes(&self, bytes: u64) {
self.kv_write_bytes.fetch_add(bytes, Ordering::Relaxed);
self.kv_write_sample_bytes
.fetch_add(bytes, Ordering::Relaxed);
}
pub(crate) fn kv_write_finished(&self, elapsed: Duration, failed: bool) {
@@ -560,6 +573,17 @@ impl Metrics {
}
}
pub(crate) fn take_prefill_sample(&self) -> f32 {
f32::from_bits(self.prefill_sample.swap(0, Ordering::Relaxed))
}
pub(crate) fn take_kv_io_sample(&self) -> (u64, u64) {
(
self.kv_read_sample_bytes.swap(0, Ordering::Relaxed),
self.kv_write_sample_bytes.swap(0, Ordering::Relaxed),
)
}
fn record_checkpoint(&self, source: WorkSource, previous_bytes: Option<u64>, bytes: u64) {
if bytes == 0 {
return;
@@ -685,6 +709,8 @@ mod tests {
metrics.request_started(WorkSource::LocalChat);
metrics.prefill_progress(100, 1_000, 250.0);
metrics.generation_progress(120, 1_000, 20.0);
assert_eq!(metrics.take_prefill_sample(), 250.0);
assert_eq!(metrics.take_prefill_sample(), 0.0);
metrics.kv_lookup(KvLookup::DiskHit);
metrics.kv_lookup(KvLookup::MemoryHit);
metrics.kv_lookup(KvLookup::Miss);
@@ -697,6 +723,8 @@ mod tests {
metrics.kv_write_started();
metrics.kv_write_bytes(4_096);
metrics.kv_write_finished(Duration::from_millis(20), false);
assert_eq!(metrics.take_kv_io_sample(), (2_048, 4_096));
assert_eq!(metrics.take_kv_io_sample(), (0, 0));
metrics.request_finished(
WorkSource::LocalChat,
Duration::from_millis(250),