Fix cloud shotover metrics

shotover · Feb 1, 2024 · 9155b62 · 9155b62
1 parent 82a245e
commit 9155b62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,7 +61,7 @@ rand_distr = "0.4.1"
 clap = { version = "4.0.4", features = ["cargo", "derive"] }
 async-trait = "0.1.30"
 typetag = "0.2.5"
-aws-throwaway = { version = "0.6.0", default-features = false }
+aws-throwaway = { version = "0.6.0", default-features = false, git = "https://github.com/rukai/aws-throwaway", branch = "expose_ports_to_internet" }
 tokio-bin-process = "0.4.0"
 ordered-float = { version = "4.0.0", features = ["serde"] }
 hyper = { version = "0.14.14", features = ["server"] }

diff --git a/shotover-proxy/benches/windsock/cloud/aws.rs b/shotover-proxy/benches/windsock/cloud/aws.rs
@@ -22,6 +22,8 @@ impl AwsInstances {
     pub async fn new() -> Self {
         AwsInstances {
             aws: Aws::builder(CleanupResources::WithAppTag(AWS_THROWAWAY_TAG.to_owned()))
+                // shotover metrics port
+                .expose_ports_to_internet(vec![9001])
                 .build()
                 .await,
         }

diff --git a/shotover-proxy/benches/windsock/profilers/shotover_metrics.rs b/shotover-proxy/benches/windsock/profilers/shotover_metrics.rs
@@ -148,14 +148,15 @@ impl ShotoverMetrics {
             tokio::select! {
                 _ = shutdown_rx.recv() => break,
                 _ = interval.tick() => {
-                    match tokio::time::timeout(Duration::from_secs(3), reqwest::get(url)).await.unwrap() {
-                        Ok(response) => {
+                    match tokio::time::timeout(Duration::from_secs(3), reqwest::get(url)).await {
+                        Ok(Ok(response)) => {
                             results.push(RawPrometheusExposition {
                                 timestamp: OffsetDateTime::now_utc(),
                                 content: response.text().await.unwrap(),
                             });
                         }
-                        Err(err) => tracing::debug!("Failed to request from metrics endpoint, probably not up yet, error was {err:?}")
+                        Ok(Err(err)) => tracing::error!("Failed to request from metrics endpoint {url}, probably not up yet, error was {err:?}"),
+                        Err(err) => tracing::error!("Timed out request from metrics endpoint {url}, probably not up yet, error was {err:?}")
                     }
                 }
             }