chore: Add integration tests for Open Telemetry

Cargo.toml

@@ -1,6 +1,11 @@
 [workspace]
 default-members = ["apollo-router", "apollo-router-core"]
-members = ["apollo-router", "apollo-router-core", "apollo-router-benchmarks", "xtask"]
+members = [
+    "apollo-router",
+    "apollo-router-core",
+    "apollo-router-benchmarks",
+    "xtask",
+]
 
 [patch.crates-io]
 opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "6b3aa02aa" }

apollo-router-core/src/query_planner/mod.rs

@@ -45,11 +45,8 @@ pub(crate) enum PlanNode {
 
 impl QueryPlan {
     /// Validate the entire request for variables and services used.
-    #[tracing::instrument(name = "validation", level = "debug", skip_all)]
-    pub fn validate_request(
-        &self,
-        service_registry: Arc<dyn ServiceRegistry>,
-    ) -> Result<(), Response> {
+    #[tracing::instrument(skip_all, name = "validate", level = "debug")]
+    pub fn validate(&self, service_registry: Arc<dyn ServiceRegistry>) -> Result<(), Response> {
         let mut early_errors = Vec::new();
         for err in self
             .root
@@ -323,14 +320,16 @@ mod fetch {
 
             let query_span = tracing::info_span!("subfetch", service = service_name.as_str());
 
-            let Variables { variables, paths } = Variables::new(
-                &self.requires,
-                self.variable_usages.as_ref(),
-                data,
-                current_dir,
-                request,
-                schema,
-            )?;
+            let Variables { variables, paths } = query_span.in_scope(|| {
+                Variables::new(
+                    &self.requires,
+                    self.variable_usages.as_ref(),
+                    data,
+                    current_dir,
+                    request,
+                    schema,
+                )
+            })?;
 
             let fetcher = service_registry
                 .get(service_name)
@@ -343,16 +342,18 @@ mod fetch {
                         .variables(Arc::new(variables))
                         .build(),
                 )
-                .instrument(query_span)
+                .instrument(tracing::info_span!(parent: &query_span, "subfetch_stream"))
                 .await?;
 
-            if !response.is_primary() {
-                return Err(FetchError::SubrequestUnexpectedPatchResponse {
-                    service: service_name.to_owned(),
-                });
-            }
+            query_span.in_scope(|| {
+                if !response.is_primary() {
+                    return Err(FetchError::SubrequestUnexpectedPatchResponse {
+                        service: service_name.to_owned(),
+                    });
+                }
 
-            self.response_at_path(current_dir, paths, response)
+                self.response_at_path(current_dir, paths, response)
+            })
         }
 
         #[instrument(level = "debug", name = "response_insert", skip_all)]

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", skip_all)]
+    #[tracing::instrument(skip_all, name = "plan", level = "debug")]
     async fn get(
         &self,
         query: String,

apollo-router/Cargo.toml

@@ -57,7 +57,7 @@ tokio = { version = "1.15.0", features = ["full"] }
 # don't bump it to 0.6 until opentelemetry-otlp does
 tonic = { version = "0.5.2", optional = true }
 tower = "0.4.11"
-tower-http = {version = "0.2.0", features = ["trace"] }
+tower-http = { version = "0.2.0", features = ["trace"] }
 tracing = "0.1.29"
 tracing-futures = "0.2.5"
 tracing-opentelemetry = "0.16.0"
@@ -76,6 +76,7 @@ maplit = "1.0.2"
 mockall = "0.11.0"
 reqwest = { version = "0.11.8", features = ["json", "stream"] }
 test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
+test-span = "0.1.0"
 tracing-subscriber = { version = "0.3", default-features = false, features = [
     "env-filter",
     "fmt",

apollo-router/src/apollo_router.rs

@@ -98,7 +98,7 @@ impl Router<ApolloPreparedQuery> for ApolloRouter {
             .await?;
 
         tracing::debug!("query plan\n{:#?}", query_plan);
-        query_plan.validate_request(Arc::clone(&self.service_registry))?;
+        query_plan.validate(Arc::clone(&self.service_registry))?;
 
         Ok(ApolloPreparedQuery {
             query_plan,

apollo-router/tests/integration_tests.rs

@@ -9,7 +9,7 @@ use serde_json::to_string_pretty;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
-use test_log::test;
+use test_span::prelude::*;
 use url::Url;
 
 macro_rules! assert_federated_response {
@@ -43,7 +43,7 @@ macro_rules! assert_federated_response {
     };
 }
 
-#[test(tokio::test)]
+#[tokio::test]
 async fn basic_request() {
     assert_federated_response!(
         r#"{ topProducts { name name2:name } }"#,
@@ -53,7 +53,7 @@ async fn basic_request() {
     );
 }
 
-#[test(tokio::test)]
+#[tokio::test]
 async fn basic_composition() {
     assert_federated_response!(
         r#"{ topProducts { upc name reviews {id product { name } author { id name } } } }"#,
@@ -65,7 +65,31 @@ async fn basic_composition() {
     );
 }
 
-#[test(tokio::test)]
+#[test_span(tokio::test)]
+async fn traced_basic_request() {
+    assert_federated_response!(
+        r#"{ topProducts { name name2:name } }"#,
+        hashmap! {
+            "products".to_string()=>1,
+        },
+    );
+    insta::assert_json_snapshot!(get_spans());
+}
+
+#[test_span(tokio::test)]
+async fn traced_basic_composition() {
+    assert_federated_response!(
+        r#"{ topProducts { upc name reviews {id product { name } author { id name } } } }"#,
+        hashmap! {
+            "products".to_string()=>2,
+            "reviews".to_string()=>1,
+            "accounts".to_string()=>1,
+        },
+    );
+    insta::assert_json_snapshot!(get_spans());
+}
+
+#[tokio::test]
 async fn basic_mutation() {
     assert_federated_response!(
         r#"mutation {
@@ -88,7 +112,7 @@ async fn basic_mutation() {
     );
 }
 
-#[test(tokio::test)]
+#[test_span(tokio::test)]
 async fn variables() {
     assert_federated_response!(
         r#"
@@ -113,7 +137,7 @@ async fn variables() {
     );
 }
 
-#[test(tokio::test)]
+#[tokio::test]
 async fn missing_variables() {
     let request = graphql::Request::builder()
         .query(