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

fix(metrics): provide separate memory metrics for spells #1591

Merged
merged 4 commits into from
Apr 25, 2023
Merged

fix(metrics): provide separate memory metrics for spells #1591

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4ec08b
fix(metrics): provide separate memory metrics for spells
kmd-fl Apr 25, 2023
b409d40
fix build
kmd-fl Apr 25, 2023
9c8f9c8
Merge branch 'master' into fix-spell-mem-metrics
kmd-fl Apr 25, 2023
34aca8b
fix build
kmd-fl Apr 25, 2023
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: 31 additions & 14 deletions crates/peer-metrics/src/services_metrics/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ impl ServicesMetricsBackend {
all_stats: &HashMap<ServiceId, (ServiceType, ServiceMemoryStat)>,
) {
let mut unaliased_service_total_memory = 0;
let mut unaliased_spells_total_memory = 0;
for (_, (service_type, service_stat)) in all_stats.iter() {
let service_type_label = ServiceTypeLabel {
service_type: service_type.clone(),
Expand All @@ -156,25 +157,29 @@ impl ServicesMetricsBackend {
.get_or_create(&service_type_label)
.observe(*stat.1 as f64)
}

if matches!(service_type, ServiceType::Service(Some(_))) {
let used_mem = i64::try_from(service_stat.used_mem);
match used_mem {
Ok(used_mem) => {
memory_metrics
.mem_used_total_bytes
.get_or_create(&service_type_label)
.set(used_mem);
match service_type {
ServiceType::Service(Some(_)) | ServiceType::Spell(Some(_)) => {
let used_mem = i64::try_from(service_stat.used_mem);
match used_mem {
Ok(used_mem) => {
memory_metrics
.mem_used_total_bytes
.get_or_create(&service_type_label)
.set(used_mem);
}
Err(e) => log::warn!("Could not convert metric used_mem {}", e),
}
Err(e) => log::warn!("Could not convert metric used_mem {}", e),
}
} else {
unaliased_service_total_memory += service_stat.used_mem
ServiceType::Spell(_) => {
unaliased_spells_total_memory += service_stat.used_mem;
}
_ => {
unaliased_service_total_memory += service_stat.used_mem;
}
}
}

let unaliased_service_total_memory = i64::try_from(unaliased_service_total_memory);
match unaliased_service_total_memory {
match i64::try_from(unaliased_service_total_memory) {
Ok(unaliased_service_total_memory) => {
memory_metrics
.mem_used_total_bytes
Expand All @@ -185,5 +190,17 @@ impl ServicesMetricsBackend {
}
_ => log::warn!("Could not convert metric unaliased_service_total_memory"),
}

match i64::try_from(unaliased_spells_total_memory) {
Ok(unaliased_spells_total_memory) => {
memory_metrics
.mem_used_total_bytes
.get_or_create(&ServiceTypeLabel {
service_type: ServiceType::Spell(None),
})
.set(unaliased_spells_total_memory);
}
_ => log::warn!("Could not convert metric unaliased_service_total_memory"),
}
}
}