fix: gauges should use f64 (#330)

Author: kwasniew

.gitignore

@@ -37,4 +37,6 @@ devenv.local.nix
 # Direnv
 .direnv*
 
-.DS_Store
+.DS_Store
+
+CLAUDE.md

unleash-yggdrasil/src/impact_metrics/counter.rs

@@ -1,6 +1,6 @@
 use crate::impact_metrics::types::{
-    get_label_key, parse_label_key, CollectedMetric, MetricLabels, MetricOptions, MetricType,
-    NumericMetricSample,
+    get_label_key, parse_label_key, CollectedMetric, CounterMetricSample, MetricLabels,
+    MetricOptions,
 };
 use dashmap::DashMap;
 use std::sync::atomic::{AtomicI64, Ordering};
@@ -45,21 +45,16 @@ impl Counter {
             let key = entry.key();
             let value = entry.value().swap(0, Ordering::Relaxed);
             if value != 0 {
-                samples.push(NumericMetricSample::new(parse_label_key(key), value));
+                samples.push(CounterMetricSample::new(parse_label_key(key), value));
             }
         }
 
         self.values.retain(|_, v| v.load(Ordering::Relaxed) != 0);
 
         if samples.is_empty() {
-            samples.push(NumericMetricSample::zero());
+            samples.push(CounterMetricSample::zero());
         }
 
-        CollectedMetric::new_numeric(
-            &self.opts.name,
-            &self.opts.help,
-            MetricType::Counter,
-            samples,
-        )
+        CollectedMetric::new_counter(&self.opts.name, &self.opts.help, samples)
     }
 }

unleash-yggdrasil/src/impact_metrics/gauge.rs

@@ -1,13 +1,11 @@
 use crate::impact_metrics::types::{
-    get_label_key, parse_label_key, CollectedMetric, MetricLabels, MetricOptions, MetricType,
-    NumericMetricSample,
+    get_label_key, parse_label_key, CollectedMetric, GaugeMetricSample, MetricLabels, MetricOptions,
 };
 use dashmap::DashMap;
-use std::sync::atomic::{AtomicI64, Ordering};
 
 pub struct Gauge {
     opts: MetricOptions,
-    values: DashMap<String, AtomicI64>,
+    values: DashMap<String, f64>,
 }
 
 impl Gauge {
@@ -18,75 +16,75 @@ impl Gauge {
         }
     }
 
-    pub fn set(&self, value: i64) {
+    pub fn set(&self, value: f64) {
         self.set_internal(value, None);
     }
 
-    pub fn set_with_labels(&self, value: i64, labels: &MetricLabels) {
+    pub fn set_with_labels(&self, value: f64, labels: &MetricLabels) {
         self.set_internal(value, Some(labels));
     }
 
-    fn set_internal(&self, value: i64, labels: Option<&MetricLabels>) {
+    fn set_internal(&self, value: f64, labels: Option<&MetricLabels>) {
         let key = get_label_key(labels);
-        self.values
-            .entry(key)
-            .and_modify(|v| v.store(value, Ordering::Relaxed))
-            .or_insert_with(|| AtomicI64::new(value));
+        self.values.insert(key, value);
     }
 
     pub fn inc(&self) {
-        self.inc_internal(1, None);
+        self.inc_internal(1.0, None);
     }
 
-    pub fn inc_by(&self, value: i64) {
+    pub fn inc_by(&self, value: f64) {
         self.inc_internal(value, None);
     }
 
-    pub fn inc_with_labels(&self, value: i64, labels: &MetricLabels) {
+    pub fn inc_with_labels(&self, value: f64, labels: &MetricLabels) {
         self.inc_internal(value, Some(labels));
     }
 
-    fn inc_internal(&self, value: i64, labels: Option<&MetricLabels>) {
+    fn inc_internal(&self, value: f64, labels: Option<&MetricLabels>) {
         let key = get_label_key(labels);
         self.values
             .entry(key)
-            .or_insert_with(|| AtomicI64::new(0))
-            .fetch_add(value, Ordering::Relaxed);
+            .and_modify(|v| *v += value)
+            .or_insert(value);
     }
 
     pub fn dec(&self) {
-        self.dec_internal(1, None);
+        self.dec_internal(1.0, None);
     }
 
-    pub fn dec_by(&self, value: i64) {
+    pub fn dec_by(&self, value: f64) {
         self.dec_internal(value, None);
     }
 
-    pub fn dec_with_labels(&self, value: i64, labels: &MetricLabels) {
+    pub fn dec_with_labels(&self, value: f64, labels: &MetricLabels) {
         self.dec_internal(value, Some(labels));
     }
 
-    fn dec_internal(&self, value: i64, labels: Option<&MetricLabels>) {
+    fn dec_internal(&self, value: f64, labels: Option<&MetricLabels>) {
         let key = get_label_key(labels);
         self.values
             .entry(key)
-            .or_insert_with(|| AtomicI64::new(0))
-            .fetch_sub(value, Ordering::Relaxed);
+            .and_modify(|v| *v -= value)
+            .or_insert(-value);
     }
 
     pub(crate) fn collect(&self) -> CollectedMetric {
         let mut samples = Vec::new();
 
-        for entry in self.values.iter() {
-            let key = entry.key();
-            let value = entry.value().swap(0, Ordering::Relaxed);
-            if value != 0 {
-                samples.push(NumericMetricSample::new(parse_label_key(key), value));
+        for mut entry in self.values.iter_mut() {
+            let value = std::mem::take(entry.value_mut());
+            if value != 0.0 {
+                samples.push(GaugeMetricSample::new(parse_label_key(entry.key()), value));
             }
         }
 
-        self.values.retain(|_, v| v.load(Ordering::Relaxed) != 0);
+        self.values.retain(|_, v| *v != 0.0);
+
+        if samples.is_empty() {
+            samples.push(GaugeMetricSample::zero());
+        }
 
-        CollectedMetric::new_numeric(&self.opts.name, &self.opts.help, MetricType::Gauge, samples)
+        CollectedMetric::new_gauge(&self.opts.name, &self.opts.help, samples)
     }
 }

unleash-yggdrasil/src/impact_metrics/mod.rs

@@ -9,8 +9,8 @@ pub use gauge::Gauge;
 pub use histogram::Histogram;
 pub use registry::InMemoryMetricRegistry;
 pub use types::{
-    BucketMetricOptions, BucketMetricSample, CollectedMetric, HistogramBucket, MetricLabels,
-    MetricOptions, MetricSample, MetricType, NumericMetricSample,
+    BucketMetricOptions, BucketMetricSample, CollectedMetric, CounterMetricSample,
+    GaugeMetricSample, HistogramBucket, MetricLabels, MetricOptions, MetricSample, MetricType,
 };
 
 pub trait ImpactMetricRegistry {
@@ -20,14 +20,14 @@ pub trait ImpactMetricRegistry {
     fn inc_counter_with_labels(&self, name: &str, value: i64, labels: &MetricLabels);
 
     fn define_gauge(&self, opts: MetricOptions);
-    fn set_gauge(&self, name: &str, value: i64);
-    fn set_gauge_with_labels(&self, name: &str, value: i64, labels: &MetricLabels);
+    fn set_gauge(&self, name: &str, value: f64);
+    fn set_gauge_with_labels(&self, name: &str, value: f64, labels: &MetricLabels);
     fn inc_gauge(&self, name: &str);
-    fn inc_gauge_by(&self, name: &str, value: i64);
-    fn inc_gauge_with_labels(&self, name: &str, value: i64, labels: &MetricLabels);
+    fn inc_gauge_by(&self, name: &str, value: f64);
+    fn inc_gauge_with_labels(&self, name: &str, value: f64, labels: &MetricLabels);
     fn dec_gauge(&self, name: &str);
-    fn dec_gauge_by(&self, name: &str, value: i64);
-    fn dec_gauge_with_labels(&self, name: &str, value: i64, labels: &MetricLabels);
+    fn dec_gauge_by(&self, name: &str, value: f64);
+    fn dec_gauge_with_labels(&self, name: &str, value: f64, labels: &MetricLabels);
 
     fn define_histogram(&self, opts: BucketMetricOptions);
     fn observe_histogram(&self, name: &str, value: f64);