Merge pull request #111 from dfinity/igor/fix-ic-key-fetch

Fix IC root key fetching

Author: blind-oracle

src/metrics/mod.rs

@@ -296,9 +296,10 @@ pub async fn middleware(
         let domain = ctx
             .as_ref()
             .map_or_else(String::new, |x| x.domain.name.to_string());
-        let error_cause = error_cause
+
+        let (error_cause, error_cause_details) = error_cause
             .clone()
-            .map_or_else(String::new, |x| x.to_string());
+            .map_or_else(|| (String::new(), None), |x| (x.to_string(), x.details()));
 
         let upstream = req_meta
             .upstream
@@ -382,6 +383,7 @@ pub async fn middleware(
                 ic_cache_status = resp_meta.cache_status,
                 ic_cache_bypass_reason = resp_meta.cache_bypass_reason,
                 error = error_cause,
+                error_details = error_cause_details,
                 req_size = request_size,
                 request_type,
                 resp_size = response_size,

src/routing/ic/mod.rs

@@ -24,6 +24,7 @@ use ic_bn_lib::http::{
 use ic_http_gateway::{
     HttpGatewayClient, HttpGatewayClientBuilder, HttpGatewayResponse, HttpGatewayResponseMetadata,
 };
+use tracing::warn;
 
 use crate::Cli;
 
@@ -121,9 +122,15 @@ pub fn setup(
         let key = fs::read(v).context("unable to read IC root key")?;
         agent.set_root_key(key);
     } else if cli.ic.ic_unsafe_root_key_fetch {
-        tokio::runtime::Handle::current()
-            .block_on(async { agent.fetch_root_key().await })
-            .context("unable to fetch IC root key")?;
+        warn!("Fetching IC root key (UNSAFE)");
+
+        let agent = agent.clone();
+        let _ = futures::executor::block_on(async move {
+            tokio::runtime::Handle::current()
+                .spawn(async move { agent.fetch_root_key().await })
+                .await
+        })
+        .context("unable to fetch IC root key")?;
     }
 
     let client = HttpGatewayClientBuilder::new()