store maxminddb_reader in the Metrics struct

kbknapp · Apr 8, 2024 · 736f1ae · 736f1ae
1 parent 121669d
commit 736f1ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -66,7 +66,7 @@ async fn try_main(args: Args) -> Result<()> {
 
     info!("Registering metrics...");
     let registry = Arc::new(Registry::new());
-    let mut metrics = unwrap_or_exit!(Metrics::new(&registry, &maxminddb_reader));
+    let mut metrics = unwrap_or_exit!(Metrics::new(&registry, maxminddb_reader));
     let scrape_duration = unwrap_or_exit!(IntGauge::new(
         "wireguard_scrape_duration_milliseconds",
         "Duration in milliseconds of the scrape",
@@ -94,7 +94,7 @@ async fn try_main(args: Args) -> Result<()> {
 
         debug!("Updating metrics...");
         metrics
-            .update(&WireguardState::scrape(&aliases).await?, &maxminddb_reader)
+            .update(&WireguardState::scrape(&aliases).await?)
             .await;
         let after = Instant::now();
 

diff --git a/src/metrics.rs b/src/metrics.rs
@@ -13,12 +13,13 @@ pub struct Metrics {
     bytes_total: IntCounterVec,
     peer_bytes_total: IntCounterVec,
     duration_since_latest_handshake: IntGaugeVec,
+    maxminddb_reader: Option<maxminddb::Reader<Vec<u8>>>
 }
 
 impl Metrics {
     pub fn new(
         r: &Registry,
-        maxminddb_reader: &Option<maxminddb::Reader<Vec<u8>>>,
+        maxminddb_reader: Option<maxminddb::Reader<Vec<u8>>>,
     ) -> Result<Self> {
         trace!("Metrics::new");
 
@@ -88,13 +89,13 @@ impl Metrics {
             peer_endpoint,
             peer_bytes_total,
             duration_since_latest_handshake,
+            maxminddb_reader
         })
     }
 
     pub async fn update(
         &mut self,
-        state: &WireguardState,
-        maxminddb_reader: &Option<maxminddb::Reader<Vec<u8>>>,
+        state: &WireguardState
     ) {
         let it = self.interfaces_total.with_label_values(&[]);
         it.set(state.interfaces.len() as i64);
@@ -134,7 +135,7 @@ impl Metrics {
             assert!(p.interface < state.interfaces.len());
 
             if let Some(endpoint) = p.endpoint {
-                match maxminddb_reader {
+                match &self.maxminddb_reader {
                     Some(reader) => {
                         let endpoint_country = match reader.lookup::<geoip2::Country>(endpoint.ip())
                         {