Format

Author: ardatan

bin/router/src/lib.rs

@@ -8,7 +8,7 @@ mod schema_state;
 mod shared_state;
 mod supergraph;
 
-use std::{sync::Arc};
+use std::sync::Arc;
 
 use crate::{
     background_tasks::BackgroundTasksManager,
@@ -111,7 +111,7 @@ pub async fn configure_app_from_config(
         None => None,
     };
     let usage_agent = pipeline::usage_reporting::from_config(&router_config).map(Arc::new);
-    
+
     if let Some(usage_agent) = &usage_agent {
         bg_tasks_manager.register_task(usage_agent.clone());
     }
@@ -120,7 +120,11 @@ pub async fn configure_app_from_config(
     let schema_state =
         SchemaState::new_from_config(bg_tasks_manager, router_config_arc.clone()).await?;
     let schema_state_arc = Arc::new(schema_state);
-    let shared_state = Arc::new(RouterSharedState::new(router_config_arc, jwt_runtime, usage_agent)?);
+    let shared_state = Arc::new(RouterSharedState::new(
+        router_config_arc,
+        jwt_runtime,
+        usage_agent,
+    )?);
 
     Ok((shared_state, schema_state_arc))
 }

bin/router/src/pipeline/mod.rs

@@ -150,18 +150,22 @@ pub async fn execute_pipeline(
     let operation_name = normalize_payload.operation_for_plan.name.as_ref();
 
     shared_state.usage_agent.as_ref().and_then(|usage_agent| {
-        shared_state.router_config.usage_reporting.as_ref().map(|usage_config| {
-            usage_reporting::send_usage_report(
-                supergraph.schema.clone(),
-                start,
-                req,
-                operation_name,
-                &query_clone,
-                usage_agent,
-                usage_config,
-                &execution_result,
-            )
-        })
+        shared_state
+            .router_config
+            .usage_reporting
+            .as_ref()
+            .map(|usage_config| {
+                usage_reporting::send_usage_report(
+                    supergraph.schema.clone(),
+                    start,
+                    req,
+                    operation_name,
+                    &query_clone,
+                    usage_agent,
+                    usage_config,
+                    &execution_result,
+                )
+            })
     });
 
     Ok(execution_result)

bin/router/src/pipeline/usage_reporting.rs

@@ -1,19 +1,20 @@
-use std::{sync::Arc, time::{Duration, Instant, SystemTime, UNIX_EPOCH}};
+use std::{
+    sync::Arc,
+    time::{Duration, Instant, SystemTime, UNIX_EPOCH},
+};
 
 use async_trait::async_trait;
 use graphql_parser::schema::Document;
 use hive_console_sdk::agent::{ExecutionReport, UsageAgent};
-use hive_router_config::{HiveRouterConfig, usage_reporting::UsageReportingConfig};
+use hive_router_config::{usage_reporting::UsageReportingConfig, HiveRouterConfig};
 use hive_router_plan_executor::execution::plan::PlanExecutionOutput;
 use ntex::web::HttpRequest;
 use rand::Rng;
 use tokio_util::sync::CancellationToken;
 
 use crate::background_tasks::BackgroundTask;
 
-pub fn from_config(
-    router_config: &HiveRouterConfig,
-) -> Option<UsageAgent> {
+pub fn from_config(router_config: &HiveRouterConfig) -> Option<UsageAgent> {
     router_config.usage_reporting.as_ref().map(|usage_config| {
         let flush_interval = Duration::from_secs(usage_config.flush_interval);
         hive_console_sdk::agent::UsageAgent::new(

bin/router/src/schema_state.rs

@@ -1,7 +1,7 @@
 use arc_swap::{ArcSwap, Guard};
 use async_trait::async_trait;
 use graphql_parser::schema::Document;
-use graphql_tools::{validation::utils::ValidationError};
+use graphql_tools::validation::utils::ValidationError;
 use hive_router_config::{supergraph::SupergraphSource, HiveRouterConfig};
 use hive_router_plan_executor::{
     executors::error::SubgraphExecutorError,
@@ -22,7 +22,7 @@ use tracing::{debug, error, trace};
 
 use crate::{
     background_tasks::{BackgroundTask, BackgroundTasksManager},
-    pipeline::{normalize::GraphQLNormalizationPayload},
+    pipeline::normalize::GraphQLNormalizationPayload,
     supergraph::{
         base::{LoadSupergraphError, ReloadSupergraphResult, SupergraphLoader},
         resolve_from_config,