More

Author: ardatan

.vscode/settings.json

@@ -42,5 +42,8 @@
   },
   "[yaml]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[rust]": {
+    "editor.defaultFormatter": "rust-lang.rust-analyzer"
   }
 }

packages/libraries/router/src/registry.rs

@@ -121,8 +121,15 @@ impl HiveRegistry {
         env::set_var("APOLLO_ROUTER_HOT_RELOAD", "true");
 
         let mut registry = HiveRegistry {
-            fetcher: SupergraphFetcher::try_new(endpoint, key, accept_invalid_certs)
-                .map_err(|e| anyhow!(e))?,
+            fetcher: SupergraphFetcher::try_new(
+                endpoint,
+                key,
+                "hive-apollo-router".to_string(),
+                5,
+                60,
+                accept_invalid_certs,
+            )
+            .map_err(|e| anyhow!("Failed to create SupergraphFetcher: {}", e))?,
             file_name,
             logger,
         };

packages/libraries/sdk-rs/src/supergraph_fetcher.rs

@@ -1,8 +1,11 @@
+use std::time::Duration;
+
 #[derive(Debug)]
 pub struct SupergraphFetcher {
     client: reqwest::blocking::Client,
     endpoint: String,
     key: String,
+    user_agent_prefix: String,
     etag: Option<String>,
 }
 
@@ -12,6 +15,9 @@ impl SupergraphFetcher {
     pub fn try_new(
         endpoint: String,
         key: String,
+        user_agent_prefix: String,
+        connect_timeout: u64,
+        request_timeout: u64,
         accept_invalid_certs: bool,
     ) -> Result<Self, String> {
         let mut endpoint = endpoint;
@@ -22,14 +28,19 @@ impl SupergraphFetcher {
                 endpoint.push_str("/supergraph")
             }
         }
+
         let client = reqwest::blocking::Client::builder()
             .danger_accept_invalid_certs(accept_invalid_certs)
+            .connect_timeout(Duration::from_secs(connect_timeout))
+            .timeout(Duration::from_secs(request_timeout))
             .build()
-            .map_err(|err| err.to_string())?;
+            .map_err(|e| e.to_string())?;
+
         Ok(Self {
             client,
             endpoint,
             key,
+            user_agent_prefix,
             etag: None,
         })
     }
@@ -40,7 +51,7 @@ impl SupergraphFetcher {
         headers.insert(
             reqwest::header::USER_AGENT,
             reqwest::header::HeaderValue::from_str(
-                format!("hive-apollo-router/{}", COMMIT.unwrap_or("local")).as_str(),
+                format!("{}/{}", self.user_agent_prefix, COMMIT.unwrap_or("local")).as_str(),
             )
             .unwrap(),
         );