feat: Usage Reporting.

NEXT_CHANGELOG.md

@@ -25,6 +25,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 # [v0.1.0-preview.8] - (unreleased)
 ## ❗ BREAKING ❗
 ## 🚀 Features ( :rocket: )
+
+### Apollo studio Usage Reporting [PR #898](https://github.com/apollographql/router/pull/898)
+If you have [enabled telemetry](https://www.apollographql.com/docs/router/configuration/apollo-telemetry#enabling-usage-reporting), you can now see field usage reporting for your queries by heading to the Apollo studio fields section.
+Here is more information on how to [set up telemetry](https://www.apollographql.com/docs/studio/metrics/usage-reporting#pushing-metrics-from-apollo-server) and [Field Usage](https://www.apollographql.com/docs/studio/metrics/field-usage)
+
 ## 🐛 Fixes ( :bug: )
 
 ### Improve the configuration error report [PR #963](https://github.com/apollographql/router/pull/963)

apollo-router-core/Cargo.toml

@@ -17,7 +17,7 @@ apollo-parser = "0.2.5"
 async-trait = "0.1.53"
 atty = "0.2.14"
 axum = { version = "0.5.4" }
-buildstructor = "0.1.9"
+buildstructor = "0.1.10"
 bytes = "1.1.0"
 dashmap = { version = "5.1.0", features = ["serde"] }
 derivative = "2.2.0"
@@ -42,7 +42,7 @@ opentelemetry = "0.17.0"
 opentelemetry-http = "0.6.0"
 paste = "1.0.6"
 regex = "1.5.5"
-router-bridge = { git = "https://github.com/apollographql/federation-rs.git", rev = "33659ef40f44af593da047d7f3349a1b3d86136c" }
+router-bridge = { git = "https://github.com/apollographql/federation-rs.git", rev = "58506ee81a9247f4353bb5b892911ad837ba9b55" }
 schemars = { version = "0.8.8", features = ["url"] }
 serde = { version = "1.0.136", features = ["derive", "rc"] }
 serde_json = { version = "1.0.79", features = ["preserve_order"] }

apollo-router-core/src/error.rs

@@ -1,7 +1,8 @@
 use crate::prelude::graphql::*;
 use displaydoc::Display;
 use miette::{Diagnostic, NamedSource, Report, SourceSpan};
-pub use router_bridge::planner::{PlanError, PlannerSetupError};
+pub use router_bridge::planner::{PlanError, PlannerError};
+use router_bridge::planner::{PlanErrors, UsageReporting};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use thiserror::Error;
@@ -229,7 +230,7 @@ pub enum ServiceBuildError {
 #[derive(Error, Debug, Display, Clone)]
 pub enum QueryPlannerError {
     /// couldn't instantiate query planner; invalid schema: {0}
-    SchemaValidationErrors(PlannerSetupErrors),
+    SchemaValidationErrors(PlannerErrors),
 
     /// couldn't plan query: {0}
     PlanningErrors(PlanErrors),
@@ -241,7 +242,7 @@ pub enum QueryPlannerError {
     CacheResolverError(Arc<CacheResolverError>),
 
     /// empty query plan. This often means an unhandled Introspection query was sent. Please file an issue to apollographql/router.
-    EmptyPlan,
+    EmptyPlan(UsageReporting), // usage_reporting_signature
 
     /// unhandled planner result
     UnhandledPlannerResult,
@@ -252,49 +253,30 @@ pub enum QueryPlannerError {
 
 #[derive(Clone, Debug, Error)]
 /// Container for planner setup errors
-pub struct PlannerSetupErrors(Arc<Vec<PlannerSetupError>>);
+pub struct PlannerErrors(Arc<Vec<PlannerError>>);
 
-impl std::fmt::Display for PlannerSetupErrors {
+impl std::fmt::Display for PlannerErrors {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_fmt(format_args!(
             "schema validation errors: {}",
             self.0
                 .iter()
-                .map(|e| e
-                    .message
-                    .clone()
-                    .unwrap_or_else(|| "UNKNWON ERROR".to_string()))
+                .map(std::string::ToString::to_string)
                 .collect::<Vec<String>>()
                 .join(", ")
         ))
     }
 }
 
-impl From<Vec<PlannerSetupError>> for QueryPlannerError {
-    fn from(errors: Vec<PlannerSetupError>) -> Self {
-        QueryPlannerError::SchemaValidationErrors(PlannerSetupErrors(Arc::new(errors)))
+impl From<Vec<PlannerError>> for QueryPlannerError {
+    fn from(errors: Vec<PlannerError>) -> Self {
+        QueryPlannerError::SchemaValidationErrors(PlannerErrors(Arc::new(errors)))
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct PlanErrors(Arc<Vec<PlanError>>);
-
-impl From<Vec<PlanError>> for QueryPlannerError {
-    fn from(errors: Vec<PlanError>) -> Self {
-        QueryPlannerError::PlanningErrors(PlanErrors(Arc::new(errors)))
-    }
-}
-
-impl std::fmt::Display for PlanErrors {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_fmt(format_args!(
-            "query validation errors: {}",
-            self.0
-                .iter()
-                .map(|e| e.to_string())
-                .collect::<Vec<String>>()
-                .join(", ")
-        ))
+impl From<PlanErrors> for QueryPlannerError {
+    fn from(errors: PlanErrors) -> Self {
+        QueryPlannerError::PlanningErrors(errors)
     }
 }