More

Author: ardatan

packages/libraries/router/src/registry.rs

@@ -1,7 +1,6 @@
 use crate::consts::PLUGIN_VERSION;
 use crate::registry_logger::Logger;
 use anyhow::{anyhow, Result};
-use hive_console_sdk::supergraph_fetcher::builder::SupergraphFetcherBuilder;
 use hive_console_sdk::supergraph_fetcher::sync::SupergraphFetcherSyncState;
 use hive_console_sdk::supergraph_fetcher::SupergraphFetcher;
 use sha2::Digest;
@@ -125,7 +124,7 @@ impl HiveRegistry {
             env::set_var("APOLLO_ROUTER_HOT_RELOAD", "true");
         }
 
-        let mut fetcher = SupergraphFetcherBuilder::new()
+        let mut fetcher = SupergraphFetcher::builder()
             .key(key)
             .user_agent(format!("hive-apollo-router/{}", PLUGIN_VERSION))
             .accept_invalid_certs(accept_invalid_certs);

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

@@ -135,6 +135,7 @@ impl SupergraphFetcherBuilder {
                         let circuit_breaker = self
                             .circuit_breaker
                             .clone()
+                            .unwrap_or_default()
                             .build_async()
                             .map_err(SupergraphFetcherError::CircuitBreakerCreationError);
                         circuit_breaker.map(|cb| (endpoint, cb))

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

@@ -16,7 +16,7 @@ pub struct SupergraphFetcherBuilder {
     pub(crate) request_timeout: Duration,
     pub(crate) accept_invalid_certs: bool,
     pub(crate) retry_policy: ExponentialBackoff,
-    pub(crate) circuit_breaker: CircuitBreakerBuilder,
+    pub(crate) circuit_breaker: Option<CircuitBreakerBuilder>,
 }
 
 impl Default for SupergraphFetcherBuilder {
@@ -29,7 +29,7 @@ impl Default for SupergraphFetcherBuilder {
             request_timeout: Duration::from_secs(60),
             accept_invalid_certs: false,
             retry_policy: ExponentialBackoff::builder().build_with_max_retries(3),
-            circuit_breaker: CircuitBreakerBuilder::default(),
+            circuit_breaker: None,
         }
     }
 }
@@ -101,6 +101,11 @@ impl SupergraphFetcherBuilder {
         self
     }
 
+    pub fn circuit_breaker(&mut self, builder: CircuitBreakerBuilder) -> &mut Self {
+        self.circuit_breaker = Some(builder);
+        self
+    }
+
     pub(crate) fn validate_endpoints(&self) -> Result<(), SupergraphFetcherError> {
         if self.endpoints.is_empty() {
             return Err(SupergraphFetcherError::MissingConfigurationOption(

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

@@ -2,6 +2,7 @@ use std::fmt::Display;
 use tokio::sync::RwLock;
 
 use crate::circuit_breaker::CircuitBreakerError;
+use crate::supergraph_fetcher::async_::SupergraphFetcherAsyncState;
 use recloser::AsyncRecloser;
 use recloser::Recloser;
 use reqwest::header::HeaderValue;
@@ -33,6 +34,13 @@ enum SupergraphFetcherAsyncOrSyncClient {
     },
 }
 
+// Doesn't matter which one we implement this for, both have the same builder
+impl SupergraphFetcher<SupergraphFetcherAsyncState> {
+    pub fn builder() -> builder::SupergraphFetcherBuilder {
+        builder::SupergraphFetcherBuilder::default()
+    }
+}
+
 pub enum SupergraphFetcherError {
     FetcherCreationError(reqwest::Error),
     NetworkError(reqwest_middleware::Error),

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

@@ -170,6 +170,7 @@ impl SupergraphFetcherBuilder {
                         let circuit_breaker = self
                             .circuit_breaker
                             .clone()
+                            .unwrap_or_default()
                             .build_sync()
                             .map_err(SupergraphFetcherError::CircuitBreakerCreationError);
                         circuit_breaker.map(|cb| (endpoint, cb))