Fixes

Author: ardatan

bin/router/src/lib.rs

@@ -110,10 +110,10 @@ pub async fn configure_app_from_config(
         Some(jwt_config) => Some(JwtAuthRuntime::init(bg_tasks_manager, jwt_config).await?),
         None => None,
     };
-    let usage_agent = pipeline::usage::from_config(&router_config).map(Arc::new);
+    let usage_agent = pipeline::usage_reporting::from_config(&router_config).map(Arc::new);
 
-    if let Some(usage_agent) = usage_agent.clone() {
-        bg_tasks_manager.register_task(usage_agent);
+    if let Some(usage_agent) = &usage_agent {
+        bg_tasks_manager.register_task(usage_agent.clone());
     }
 
     let router_config_arc = Arc::new(router_config);

bin/router/src/pipeline/mod.rs

@@ -40,7 +40,7 @@ pub mod normalize;
 pub mod parser;
 pub mod progressive_override;
 pub mod query_plan;
-pub mod usage;
+pub mod usage_reporting;
 pub mod validation;
 
 static GRAPHIQL_HTML: &str = include_str!("../../static/graphiql.html");
@@ -151,7 +151,7 @@ pub async fn execute_pipeline(
 
     shared_state.usage_agent.as_ref().and_then(|usage_agent| {
         shared_state.router_config.usage_reporting.as_ref().map(|usage_config| {
-            usage::send_usage_report(
+            usage_reporting::send_usage_report(
                 supergraph.schema.clone(),
                 start,
                 req,

bin/router/src/pipeline/usage.rs renamed to bin/router/src/pipeline/usage_reporting.rs

@@ -19,6 +19,7 @@ pub fn from_config(
         hive_console_sdk::agent::UsageAgent::new(
             usage_config.token.clone(),
             usage_config.endpoint.clone(),
+            usage_config.target_id.clone(),
             usage_config.buffer_size,
             usage_config.connect_timeout,
             usage_config.request_timeout,

docs/README.md

@@ -1762,7 +1762,7 @@ Configuration for usage reporting to GraphQL Hive.
 |**flush\_interval**|`integer`|Frequency of flushing the buffer to the server<br/>Default: 5 seconds<br/>Default: `5`<br/>Format: `"uint64"`<br/>Minimum: `0`<br/>|no|
 |**request\_timeout**|`integer`|A timeout for the entire request to Hive Console<br/>Unit: seconds<br/>Default: 15 (s)<br/>Default: `15`<br/>Format: `"uint64"`<br/>Minimum: `0`<br/>|no|
 |**sample\_rate**|`number`|Sample rate to determine sampling.<br/>0.0 = 0% chance of being sent<br/>1.0 = 100% chance of being sent<br/>Default: 1.0<br/>Default: `1`<br/>Format: `"double"`<br/>|no|
-|**target\_id**|`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.<br/>|yes|
+|**target\_id**|`string`, `null`|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.<br/>|no|
 |**token**|`string`|Your [Registry Access Token](https://the-guild.dev/graphql/hive/docs/management/targets#registry-access-tokens) with write permission.<br/>|yes|
 
 **Additional Properties:** not allowed  

lib/router-config/src/usage_reporting.rs

@@ -7,7 +7,7 @@ pub struct UsageReportingConfig {
     /// Your [Registry Access Token](https://the-guild.dev/graphql/hive/docs/management/targets#registry-access-tokens) with write permission.
     pub 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.
-    pub target_id: String,
+    pub target_id: Option<String>,
     /// For self-hosting, you can override `/usage` endpoint (defaults to `https://app.graphql-hive.com/usage`).
     #[serde(default = "default_endpoint")]
     pub endpoint: String,