Reporting followups

apollo-router-core/src/spec/schema.rs

@@ -5,6 +5,8 @@ use apollo_parser::ast;
 use http::Uri;
 use itertools::Itertools;
 use router_bridge::api_schema;
+use sha2::Digest;
+use sha2::Sha256;
 use std::collections::{HashMap, HashSet};
 
 /// A GraphQL schema.
@@ -19,6 +21,7 @@ pub struct Schema {
     pub(crate) custom_scalars: HashSet<String>,
     pub(crate) enums: HashMap<String, HashSet<String>>,
     api_schema: Option<Box<Schema>>,
+    pub schema_id: Option<String>,
 }
 
 impl std::str::FromStr for Schema {
@@ -366,6 +369,10 @@ impl std::str::FromStr for Schema {
                 })
                 .collect();
 
+            let mut hasher = Sha256::new();
+            hasher.update(schema.as_bytes());
+            let schema_id = Some(format!("{:x}", hasher.finalize()));
+
             Ok(Schema {
                 subtype_map,
                 string: schema.to_owned(),
@@ -376,6 +383,7 @@ impl std::str::FromStr for Schema {
                 custom_scalars,
                 enums,
                 api_schema: None,
+                schema_id,
             })
         }
     }
@@ -692,7 +700,6 @@ mod tests {
         .parse()
         .unwrap();
 
-        println!("subgraphs: {:?}", schema.subgraphs);
         assert_eq!(schema.subgraphs.len(), 4);
         assert_eq!(
             schema
@@ -750,6 +757,23 @@ mod tests {
             .is_none());
     }
 
+    #[test]
+    fn schema_id() {
+        let schema = Schema::from_str(include_str!("../testdata/contract_schema.graphql")).unwrap();
+
+        // Line endings affect the schema hash.
+        #[cfg(windows)]
+        assert_eq!(
+            schema.schema_id,
+            Some("c081a7ff570f630bdf22cb6ca73a2bb1d46657ef69fc66749f5a1f99332b5ecb".to_string())
+        );
+        #[cfg(not(windows))]
+        assert_eq!(
+            schema.schema_id,
+            Some("6881633761291f4a6e4f9a4a6bbe7ad69a80c63ebebfc357464b7a6ef276ef0a".to_string())
+        );
+    }
+
     // test for https://github.com/apollographql/federation/pull/1769
     #[test]
     fn inaccessible_on_non_core() {

apollo-router/Cargo.toml

@@ -76,6 +76,7 @@ serde = { version = "1.0.136", features = ["derive", "rc"] }
 serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
 serde_json = { version = "1.0.79", features = ["preserve_order"] }
 serde_yaml = "0.8.24"
+sys-info = "0.9.1"
 thiserror = "1.0.30"
 tokio = { version = "1.17.0", features = ["full"] }
 tokio-util = { version = "0.7.1", features = ["net", "codec"] }
@@ -95,6 +96,12 @@ rhai = { version = "1.7.0", features = ["sync", "serde", "internals"] }
 libc = "0.2.125"
 yaml-rust = "0.4.5"
 
+[target.'cfg(macos)'.dependencies]
+uname = "0.1.1"
+
+[target.'cfg(unix)'.dependencies]
+uname = "0.1.1"
+
 [dev-dependencies]
 insta = "1.12.0"
 jsonpath_lib = "0.3.0"

apollo-router/src/plugins/telemetry/apollo.rs

@@ -32,6 +32,11 @@ pub struct Config {
         default = "client_version_header_default"
     )]
     pub client_version_header: HeaderName,
+
+    // This'll get overridden if a user tries to set it.
+    // The purpose is to allow is to pass this in to the plugin.
+    #[schemars(skip)]
+    pub(crate) schema_id: String,
 }
 
 fn apollo_key_env_str() -> Option<String> {
@@ -74,6 +79,7 @@ impl Default for Config {
             apollo_graph_ref: None,
             client_name_header: client_name_header_default(),
             client_version_header: client_version_header_default(),
+            schema_id: "<no_schema_id>".to_string(),
         }
     }
 }