From 7060fa6dad58f17543f5086c73b1854ad1ceae60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Mon, 3 Mar 2025 17:24:10 +0000 Subject: [PATCH] fixed sphinx version metrics registration (#5546) --- contracts/Cargo.lock | 2 +- nym-node/nym-node-metrics/src/mixnet.rs | 3 ++- nym-node/nym-node-metrics/src/prometheus_wrapper.rs | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 7a2e25bfb6..ddf71c7999 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "ahash" diff --git a/nym-node/nym-node-metrics/src/mixnet.rs b/nym-node/nym-node-metrics/src/mixnet.rs index ee99510c38..f4b9da4722 100644 --- a/nym-node/nym-node-metrics/src/mixnet.rs +++ b/nym-node/nym-node-metrics/src/mixnet.rs @@ -63,6 +63,7 @@ impl MixingStats { .or_default() .forward_packets .received += 1; + *self.ingress.received_versions.entry(version).or_default() += 1; } @@ -213,7 +214,7 @@ impl Display for PacketKind { PacketKind::Unknown => "unknown".fmt(f), PacketKind::Outfox => "outfox".fmt(f), PacketKind::Sphinx(sphinx_version) => { - write!(f, "sphinx-{sphinx_version}") + write!(f, "sphinx_{sphinx_version}") } } } diff --git a/nym-node/nym-node-metrics/src/prometheus_wrapper.rs b/nym-node/nym-node-metrics/src/prometheus_wrapper.rs index 8fdfb5b488..e6c18c6f38 100644 --- a/nym-node/nym-node-metrics/src/prometheus_wrapper.rs +++ b/nym-node/nym-node-metrics/src/prometheus_wrapper.rs @@ -291,7 +291,13 @@ impl PrometheusMetric { } fn set(&self, value: i64) { - metrics_registry().set(&self.name(), value); + let reg = metrics_registry(); + if !reg.set(&self.name(), value) { + if let Some(registrable) = self.to_registrable_metric() { + reg.register_metric(registrable); + reg.set(&self.name(), value); + } + } } fn set_float(&self, value: f64) {