Enabled

Author: ardatan

bin/router/src/lib.rs

@@ -110,10 +110,14 @@ pub async fn configure_app_from_config(
         true => Some(JwtAuthRuntime::init(bg_tasks_manager, &router_config.jwt).await?),
         false => None,
     };
-    let usage_agent = router_config
-        .usage_reporting
-        .as_ref()
-        .map(|usage_config| Arc::new(create_hive_user_agent(usage_config)));
+
+    let usage_agent = if router_config.usage_reporting.enabled {
+        Some(Arc::new(create_hive_user_agent(
+            &router_config.usage_reporting,
+        )))
+    } else {
+        None
+    };
 
     if let Some(usage_agent) = &usage_agent {
         bg_tasks_manager.register_task(usage_agent.clone());

bin/router/src/pipeline/mod.rs

@@ -192,26 +192,19 @@ pub async fn execute_pipeline(
     )
     .await?;
 
-    shared_state
-        .hive_usage_agent
-        .as_ref()
-        .and_then(|usage_agent| {
-            shared_state
-                .router_config
-                .usage_reporting
-                .as_ref()
-                .map(|usage_config| {
-                    usage_reporting::collect_usage_report(
-                        supergraph.supergraph_schema.clone(),
-                        start.elapsed(),
-                        req,
-                        &client_request_details,
-                        usage_agent,
-                        usage_config,
-                        &execution_result,
-                    )
-                })
-        });
+    if shared_state.router_config.usage_reporting.enabled {
+        if let Some(usage_agent) = &shared_state.hive_usage_agent {
+            usage_reporting::collect_usage_report(
+                supergraph.supergraph_schema.clone(),
+                start.elapsed(),
+                req,
+                &client_request_details,
+                usage_agent,
+                &shared_state.router_config.usage_reporting,
+                &execution_result,
+            );
+        }
+    }
 
     Ok(execution_result)
 }

lib/router-config/src/env_overrides.rs

@@ -33,6 +33,10 @@ pub struct EnvVarOverrides {
     pub hive_console_cdn_key: Option<String>,
     #[envconfig(from = "HIVE_CDN_POLL_INTERVAL")]
     pub hive_console_cdn_poll_interval: Option<String>,
+    #[envconfig(from = "HIVE_ACCESS_TOKEN")]
+    pub hive_access_token: Option<String>,
+    #[envconfig(from = "HIVE_TARGET")]
+    pub hive_target: Option<String>,
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -99,6 +103,14 @@ impl EnvVarOverrides {
             }
         }
 
+        if let Some(hive_access_token) = self.hive_access_token.take() {
+            config = config.set_override("usage_reporting.access_token", hive_access_token)?;
+            if let Some(hive_target) = self.hive_target.take() {
+                config = config.set_override("usage_reporting.target_id", hive_target)?;
+            }
+            config = config.set_override("usage_reporting.enabled", true)?;
+        }
+
         // GraphiQL overrides
         if let Some(graphiql_enabled) = self.graphiql_enabled.take() {
             config = config.set_override("graphiql.enabled", graphiql_enabled)?;

lib/router-config/src/lib.rs

@@ -96,7 +96,7 @@ pub struct HiveRouterConfig {
 
     /// Configuration for usage reporting to GraphQL Hive.
     #[serde(default)]
-    pub usage_reporting: Option<usage_reporting::UsageReportingConfig>,
+    pub usage_reporting: usage_reporting::UsageReportingConfig,
 }
 
 #[derive(Debug, thiserror::Error)]

lib/router-config/src/usage_reporting.rs

@@ -6,6 +6,8 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct UsageReportingConfig {
+    #[serde(default = "default_enabled")]
+    pub enabled: bool,
     /// Your [Registry Access Token](https://the-guild.dev/graphql/hive/docs/management/targets#registry-access-tokens) with write permission.
     pub access_token: String,
     /// A target ID, this can either be a slug following the format “$organizationSlug/$projectSlug/$targetSlug” (e.g “the-guild/graphql-hive/staging”) or an UUID (e.g. “a0f4c605-6541-4350-8cfe-b31f21a4bf80”). To be used when the token is configured with an organization access token.
@@ -64,6 +66,30 @@ pub struct UsageReportingConfig {
     pub flush_interval: Duration,
 }
 
+impl Default for UsageReportingConfig {
+    fn default() -> Self {
+        Self {
+            enabled: default_enabled(),
+            access_token: String::new(),
+            target_id: None,
+            endpoint: default_endpoint(),
+            sample_rate: default_sample_rate(),
+            exclude: Vec::new(),
+            client_name_header: default_client_name_header(),
+            client_version_header: default_client_version_header(),
+            buffer_size: default_buffer_size(),
+            accept_invalid_certs: default_accept_invalid_certs(),
+            connect_timeout: default_connect_timeout(),
+            request_timeout: default_request_timeout(),
+            flush_interval: default_flush_interval(),
+        }
+    }
+}
+
+fn default_enabled() -> bool {
+    false
+}
+
 fn default_endpoint() -> String {
     "https://app.graphql-hive.com/usage".to_string()
 }