Merge ticket branch t082

src/engine/ingest.rs

@@ -106,12 +106,25 @@ pub async fn run_file(engine: EngineHandle, path: PathBuf) {
     }
 }
 
+async fn fetch_metrics_body(client: &reqwest::Client, url: &str) -> Result<String, String> {
+    let response = client
+        .get(url)
+        .send()
+        .await
+        .map_err(|err| format!("warning: failed to poll metrics endpoint {url}: {err}"))?;
+    let response = response
+        .error_for_status()
+        .map_err(|err| format!("warning: metrics endpoint {url} returned an error: {err}"))?;
+    response
+        .text()
+        .await
+        .map_err(|err| format!("warning: failed to read metrics response from {url}: {err}"))
+}
+
 pub async fn run_metrics_poll(engine: EngineHandle, url: String) {
     let client = reqwest::Client::new();
     loop {
-        match client.get(&url).send().await {
+        match fetch_metrics_body(&client, &url).await {
-            Ok(response) => match response.error_for_status() {
-                Ok(response) => match response.text().await {
             Ok(body) => {
                 let now = Timestamp::now();
                 for sample in parse_openmetrics(&body, now) {
@@ -120,11 +133,7 @@ pub async fn run_metrics_poll(engine: EngineHandle, url: String) {
                     }
                 }
             }
-                    Err(err) => eprintln!("warning: failed to read metrics response from {url}: {err}"),
+            Err(warning) => eprintln!("{warning}"),
-                },
-                Err(err) => eprintln!("warning: metrics endpoint {url} returned an error: {err}"),
-            },
-            Err(err) => eprintln!("warning: failed to poll metrics endpoint {url}: {err}"),
         }
         tokio::time::sleep(METRICS_POLL_INTERVAL).await;
     }