From 1200f53bdfa82ba25fbfa5877fcbbdb4faf84baf Mon Sep 17 00:00:00 2001
From: danielle-tfh <danielle.nagar@toolsforhumanity.com>
Date: Wed, 23 Oct 2024 11:55:32 +0200
Subject: [PATCH] Add creating global metrics recorder in file

---
 deploy/stage/common-values-iris-mpc.yaml |  5 +----
 iris-mpc/src/bin/server.rs               | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/deploy/stage/common-values-iris-mpc.yaml b/deploy/stage/common-values-iris-mpc.yaml
index e026b5f1a..bb75f024b 100644
--- a/deploy/stage/common-values-iris-mpc.yaml
+++ b/deploy/stage/common-values-iris-mpc.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.27"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.28"
 
 environment: stage
 replicaCount: 1
@@ -78,6 +78,3 @@ libsDir:
       file: "libcublasLt.so.12.2.5.6"
     - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6"
       file: "libcublas.so.12.2.5.6"
-
-metrics:
-  enabled: true
diff --git a/iris-mpc/src/bin/server.rs b/iris-mpc/src/bin/server.rs
index 4a1ab2887..90798b02a 100644
--- a/iris-mpc/src/bin/server.rs
+++ b/iris-mpc/src/bin/server.rs
@@ -34,16 +34,14 @@ use iris_mpc_gpu::{
     },
 };
 use iris_mpc_store::{Store, StoredIrisRef};
+use metrics_exporter_statsd::StatsdBuilder;
 use std::{
     collections::HashMap,
     mem,
     sync::{Arc, LazyLock, Mutex},
     time::{Duration, Instant},
 };
-use telemetry_batteries::{
-    metrics::statsd::StatsdBattery,
-    tracing::{datadog::DatadogBattery, TracingShutdownHandle},
-};
+use telemetry_batteries::tracing::{datadog::DatadogBattery, TracingShutdownHandle};
 use tokio::{
     sync::{mpsc, oneshot, Semaphore},
     task::spawn_blocking,
@@ -418,15 +416,16 @@ fn initialize_tracing(config: &Config) -> eyre::Result<TracingShutdownHandle> {
         );
 
         if let Some(metrics_config) = &service.metrics {
-            StatsdBattery::init(
-                &metrics_config.host,
-                metrics_config.port,
-                metrics_config.queue_size,
-                metrics_config.buffer_size,
-                Some(&metrics_config.prefix),
-            )?;
+            tracing::info!("Initializing metrics using config...");
+            let recorder = StatsdBuilder::from(&metrics_config.host, metrics_config.port)
+                .with_queue_size(metrics_config.queue_size)
+                .with_buffer_size(metrics_config.buffer_size)
+                .histogram_is_distribution()
+                .build(Some(&metrics_config.prefix))?;
+
+            metrics::set_global_recorder(recorder)?;
         }
-
+        metrics::counter!("metrics.test").increment(1);
         Ok(tracing_shutdown_handle)
     } else {
         tracing_subscriber::registry()