Use client within the probe thread

Author: Thomas Luijken

oxybox/src/config/app_config.rs

@@ -1,5 +1,5 @@
-use std::{net::IpAddr, time::Duration};
 use std::env;
+use std::{net::IpAddr, time::Duration};
 
 use tokio_native_tls::TlsConnector as TokioTlsConnector;
 use trust_dns_resolver::{
@@ -21,11 +21,9 @@ pub struct AppConfig {
 /// parses it into a `Config` struct, and overrides certain values with environment variables.
 /// It also sets up the DNS hosts and Mimir endpoint.
 pub fn load_config() -> AppConfig {
-
-    let config_file_location =
-        env::var("CONFIG_FILE").unwrap_or_else(|_| "config.yml".to_string());
-    let config_str = std::fs::read_to_string(&config_file_location)
-        .expect("Failed to read config.yaml");
+    let config_file_location = env::var("CONFIG_FILE").unwrap_or_else(|_| "config.yml".to_string());
+    let config_str =
+        std::fs::read_to_string(&config_file_location).expect("Failed to read config.yaml");
 
     let config: Config = serde_yaml::from_str(&config_str).expect("Invalid YAML");
 
@@ -65,7 +63,9 @@ pub fn setup_tls_connector() -> Result<TokioTlsConnector, native_tls::Error> {
 ///     * `dns_hosts` - A slice of strings representing DNS host IPs (e.g., "
 /// # Returns
 ///     A `Result` containing a `TokioAsyncResolver` if successful, or an error if the setup fails.
-pub fn setup_resolver(dns_hosts: &[String]) -> Result<TokioAsyncResolver, Box<dyn std::error::Error>> {
+pub fn setup_resolver(
+    dns_hosts: &[String],
+) -> Result<TokioAsyncResolver, Box<dyn std::error::Error>> {
     let mut opts = ResolverOpts::default();
     opts.attempts = 2;
     opts.timeout = Duration::from_millis(100);

oxybox/src/config/mod.rs

@@ -1,2 +1,2 @@
-pub mod probe_config;
 pub mod app_config;
+pub mod probe_config;

oxybox/src/config/probe_config.rs

@@ -4,7 +4,6 @@ use serde::Deserialize;
 /// Contains the organisation ID, the polling interval in seconds, and a list of target configurations.
 #[derive(Debug, Clone, Deserialize)]
 pub struct OrganisationConfig {
-
     /// The organisation ID for which this configuration applies.
     /// This translates to the 'Org-Id' header in the Mimir requests.
     pub organisation_id: String,
@@ -20,7 +19,6 @@ pub struct OrganisationConfig {
 /// Contains the target URL and a list of accepted HTTP status codes.
 #[derive(Debug, Clone, Deserialize)]
 pub struct TargetConfig {
-
     /// The URL of the target service to be monitored.
     pub url: String,
 
@@ -74,7 +72,9 @@ pub mod test {
         assert_eq!(demo_config.targets[0].url, "https://www.google.com");
         assert_eq!(demo_config.targets[1].url, "https://www.github.com");
         assert_eq!(demo_config.targets[1].accepted_status_codes, vec![200, 301]);
-        let org_x_config = config.get("organisationX").expect("OrganisationX config not found");
+        let org_x_config = config
+            .get("organisationX")
+            .expect("OrganisationX config not found");
         assert_eq!(org_x_config.organisation_id, "1");
         assert_eq!(org_x_config.polling_interval_seconds, 20);
         assert_eq!(org_x_config.targets.len(), 1);

oxybox/src/http_probe/probe.rs

@@ -18,7 +18,6 @@ use trust_dns_resolver::{AsyncResolver, TokioAsyncResolver};
 
 use super::result::ProbeResult;
 
-
 /// Struct to hold the results of an HTTP probe.
 /// This struct contains various metrics related to the HTTP request, such as DNS resolution time, connection time, TLS handshake time, HTTP status code, and more.
 /// # Fields
@@ -46,7 +45,6 @@ async fn get_connect_timings(
     >,
     with_tls: bool,
 ) -> Result<HttpProbeResult, String> {
-
     // step one: DNS resolution
     let dns_start = Instant::now();
     if host.is_empty() {
@@ -87,7 +85,7 @@ async fn get_connect_timings(
             tls_time: None,
         });
     }
-    
+
     // step four: TLS handshake
     let tls_start = Instant::now();
     let tls_stream = connector.connect(host, stream).await;
@@ -166,7 +164,6 @@ async fn probe_url(
     >,
     url: &str,
 ) -> Result<ProbeResult, String> {
-
     let probe_start = Instant::now();
     let url = url.to_string();
 
@@ -225,7 +222,6 @@ async fn probe_url(
     })
 }
 
-
 pub async fn run_probe_loop(
     tenant_name: String,
     org_config: OrganisationConfig,
@@ -234,18 +230,10 @@ pub async fn run_probe_loop(
     mimir_endpoint: String,
     max_org_width: usize,
 ) {
-    let client = Client::builder()
-        .timeout(Duration::from_secs(5))
-        .danger_accept_invalid_certs(true)
-        .user_agent("reqwest-h2-h3-probe/1.0")
-        .build()
-        .expect("Failed to create client");
-
     loop {
         let mut handles = vec![];
 
         for target in &org_config.targets {
-            let client = client.clone();
             let connector = tls_connector.clone();
             let resolver = resolver.clone();
             let target = target.clone();
@@ -258,7 +246,6 @@ pub async fn run_probe_loop(
                     tenant_name,
                     &org_id,
                     &target,
-                    &client,
                     &connector,
                     &resolver,
                     &mimir_endpoint,
@@ -287,7 +274,6 @@ fn to_fixed_width(input: &str, width: usize) -> String {
     format!("{:<width$}", truncated, width = width)
 }
 
-
 /// Handles probing a target URL and sending the results to Mimir.
 /// # Arguments
 ///     * `tenant` - The tenant name for logging and metrics.
@@ -302,12 +288,18 @@ async fn handle_target_probe(
     tenant: String,
     org_id: &str,
     target: &TargetConfig,
-    client: &Client,
     tls_connector: &TokioTlsConnector,
     resolver: &TokioAsyncResolver,
     mimir_target: &str,
     max_width: usize,
 ) {
+    let client = Client::builder()
+        .timeout(Duration::from_secs(5))
+        .danger_accept_invalid_certs(true)
+        .user_agent("reqwest-h2-h3-probe/1.0")
+        .build()
+        .expect("Failed to create client");
+
     let url = &target.url;
     let result = probe_url(client.clone(), tls_connector, resolver, url).await;
 
@@ -338,7 +330,8 @@ async fn handle_target_probe(
             } else {
                 log::error!(
                     "[{padded_tenant}] ❌ Unexpected status for {url}: {:?} (accepted: {:?})",
-                    probe.http_status, target.accepted_status_codes
+                    probe.http_status,
+                    target.accepted_status_codes
                 );
             }
 

oxybox/src/main.rs

@@ -1,6 +1,6 @@
-use std::time::Duration;
 use config::app_config::{load_config, setup_resolver, setup_tls_connector};
 use dotenvy::dotenv;
+use std::time::Duration;
 use tokio::time::sleep;
 pub mod http_probe;
 use http_probe::probe::run_probe_loop;
@@ -37,6 +37,3 @@ async fn main() {
         sleep(Duration::from_secs(60)).await;
     }
 }
-
-
-

oxybox/src/mimir/client.rs

@@ -160,6 +160,5 @@ mod tests {
         }
 
         assert!(true);
-        
     }
 }