add the missing skip_all on instrument attributes (#287)

apollographql · Jan 5, 2022 · 2e941bc · 2e941bc
1 parent eab6185
commit 2e941bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/apollo-router-core/src/query_planner/mod.rs b/apollo-router-core/src/query_planner/mod.rs
@@ -45,10 +45,9 @@ pub(crate) enum PlanNode {
 
 impl QueryPlan {
     /// Validate the entire request for variables and services used.
-    #[tracing::instrument(name = "validation", level = "debug")]
+    #[tracing::instrument(name = "validation", level = "debug", skip_all)]
     pub fn validate_request(
         &self,
-        request: &Request,
         service_registry: Arc<dyn ServiceRegistry>,
     ) -> Result<(), Response> {
         let mut early_errors = Vec::new();

diff --git a/apollo-router-core/src/query_planner/router_bridge_query_planner.rs b/apollo-router-core/src/query_planner/router_bridge_query_planner.rs
@@ -23,7 +23,7 @@ impl RouterBridgeQueryPlanner {
 
 #[async_trait]
 impl QueryPlanner for RouterBridgeQueryPlanner {
-    #[tracing::instrument(name = "plan", level = "debug")]
+    #[tracing::instrument(name = "plan", level = "debug", skip_all)]
     async fn get(
         &self,
         query: String,

diff --git a/apollo-router/src/apollo_router.rs b/apollo-router/src/apollo_router.rs
@@ -74,7 +74,7 @@ impl ApolloRouter {
 
 #[async_trait::async_trait]
 impl Router<ApolloPreparedQuery> for ApolloRouter {
-    #[tracing::instrument(level = "debug")]
+    #[tracing::instrument(level = "debug", skip_all)]
     async fn prepare_query(
         &self,
         request: &Request,
@@ -103,7 +103,7 @@ impl Router<ApolloPreparedQuery> for ApolloRouter {
             .await?;
 
         tracing::debug!("query plan\n{:#?}", query_plan);
-        query_plan.validate_request(request, Arc::clone(&self.service_registry))?;
+        query_plan.validate_request(Arc::clone(&self.service_registry))?;
 
         Ok(ApolloPreparedQuery {
             query_plan,
@@ -125,7 +125,7 @@ pub struct ApolloPreparedQuery {
 
 #[async_trait::async_trait]
 impl PreparedQuery for ApolloPreparedQuery {
-    #[tracing::instrument(level = "debug")]
+    #[tracing::instrument(level = "debug", skip_all)]
     async fn execute(self, request: Arc<Request>) -> ResponseStream {
         let mut response = self
             .query_plan