Use plugin versions

Author: ardatan

packages/libraries/router/src/consts.rs

@@ -0,0 +1 @@
+pub const PLUGIN_VERSION: &str = env!("CARGO_PKG_VERSION");

packages/libraries/router/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod consts;
 pub mod persisted_documents;
 pub mod registry;
 pub mod registry_logger;

packages/libraries/router/src/main.rs

@@ -1,4 +1,5 @@
 // Specify the modules our binary should include -- https://twitter.com/YassinEldeeb7/status/1468680104243077128
+mod consts;
 mod persisted_documents;
 mod registry;
 mod registry_logger;

packages/libraries/router/src/registry.rs

@@ -1,3 +1,4 @@
+use crate::consts::PLUGIN_VERSION;
 use crate::registry_logger::Logger;
 use anyhow::{anyhow, Result};
 use hive_console_sdk::supergraph_fetcher::SupergraphFetcher;
@@ -124,7 +125,7 @@ impl HiveRegistry {
             fetcher: SupergraphFetcher::try_new(
                 endpoint,
                 key,
-                "hive-apollo-router".to_string(),
+                format!("hive-apollo-router/{}", PLUGIN_VERSION),
                 5,
                 60,
                 accept_invalid_certs,

packages/libraries/router/src/usage.rs

@@ -1,3 +1,4 @@
+use crate::consts::PLUGIN_VERSION;
 use apollo_router::layers::ServiceBuilderExt;
 use apollo_router::plugin::Plugin;
 use apollo_router::plugin::PluginInit;
@@ -253,7 +254,7 @@ impl Plugin for UsagePlugin {
                 request_timeout,
                 accept_invalid_certs,
                 flush_interval,
-                "hive-apollo-router".to_string(),
+                format!("hive-apollo-router/{}", PLUGIN_VERSION),
             ));
             start_flush_interval(agent.clone());
             Some(agent)

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

@@ -11,8 +11,6 @@ use std::{
 use thiserror::Error;
 use tokio_util::sync::CancellationToken;
 
-static COMMIT: Option<&'static str> = option_env!("GITHUB_SHA");
-
 #[derive(Serialize, Debug)]
 pub struct Report {
     size: usize,
@@ -115,7 +113,7 @@ pub struct UsageAgent {
     processor: Arc<OperationProcessor>,
     client: ClientWithMiddleware,
     flush_interval: Duration,
-    user_agent_prefix: String,
+    user_agent: String,
 }
 
 fn non_empty_string(value: Option<String>) -> Option<String> {
@@ -147,7 +145,7 @@ impl UsageAgent {
         request_timeout: u64,
         accept_invalid_certs: bool,
         flush_interval: Duration,
-        user_agent_prefix: String,
+        user_agent: String,
     ) -> Self {
         let processor = Arc::new(OperationProcessor::new());
 
@@ -181,7 +179,7 @@ impl UsageAgent {
             buffer_size,
             client,
             flush_interval,
-            user_agent_prefix,
+            user_agent,
         }
     }
 
@@ -278,10 +276,7 @@ impl UsageAgent {
                 reqwest::header::AUTHORIZATION,
                 format!("Bearer {}", self.token),
             )
-            .header(
-                reqwest::header::USER_AGENT,
-                format!("{}/{}", self.user_agent_prefix, COMMIT.unwrap_or("local")),
-            )
+            .header(reqwest::header::USER_AGENT, self.user_agent.to_string())
             .header(reqwest::header::CONTENT_TYPE, "application/json")
             .header(reqwest::header::CONTENT_LENGTH, report_body.len())
             .body(report_body)

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

@@ -5,17 +5,15 @@ pub struct SupergraphFetcher {
     client: reqwest::blocking::Client,
     endpoint: String,
     key: String,
-    user_agent_prefix: String,
+    user_agent: String,
     etag: Option<String>,
 }
 
-static COMMIT: Option<&'static str> = option_env!("GITHUB_SHA");
-
 impl SupergraphFetcher {
     pub fn try_new(
         endpoint: String,
         key: String,
-        user_agent_prefix: String,
+        user_agent: String,
         connect_timeout: u64,
         request_timeout: u64,
         accept_invalid_certs: bool,
@@ -40,7 +38,7 @@ impl SupergraphFetcher {
             client,
             endpoint,
             key,
-            user_agent_prefix,
+            user_agent,
             etag: None,
         })
     }
@@ -50,10 +48,7 @@ impl SupergraphFetcher {
 
         headers.insert(
             reqwest::header::USER_AGENT,
-            reqwest::header::HeaderValue::from_str(
-                format!("{}/{}", self.user_agent_prefix, COMMIT.unwrap_or("local")).as_str(),
-            )
-            .unwrap(),
+            reqwest::header::HeaderValue::from_str(&self.user_agent).unwrap(),
         );
         headers.insert("X-Hive-CDN-Key", self.key.parse().unwrap());