Merge pull request #287 from apollographql/igni/tracing_debug

qol: move a couple of printlns to tracing debug
apollographql · Dec 12, 2023 · 064cb6e · 064cb6e
2 parents 6a1f132 + a192b5e
commit 064cb6e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/apollo-router/src/plugins/connectors/subgraph_connector.rs b/apollo-router/src/plugins/connectors/subgraph_connector.rs
@@ -230,7 +230,7 @@ where
                 connector.create_requests(request, Arc::from(schema.definitions.clone()))?;
 
             let tasks = requests.into_iter().map(|(req, res_params)| async {
-                println!("HTTP {} {}", &req.method(), &req.uri());
+                tracing::debug!(method = &req.method().as_str(), uri = req.uri().to_string());
                 let mut res = client.request(req).await?;
                 res.extensions_mut().insert(res_params);
                 Ok::<_, BoxError>(res)
@@ -246,7 +246,10 @@ where
             let subgraph_response = connector
                 .map_http_responses(responses, context, hack_entity_response_key) // 4.
                 .await?;
-            dbg!(&subgraph_response.response.body().data);
+            tracing::debug!(
+                data = serde_json::to_string(&subgraph_response.response.body().data)
+                    .unwrap_or_else(|e| e.to_string())
+            );
 
             Ok(subgraph_response)
 
@@ -335,7 +338,7 @@ mod tests {
                     .body(String::new())
                     .unwrap())
             };
-            println!("generated service response: {res:?}");
+            tracing::debug!("generated service response: {res:?}");
             res
         }
 
@@ -351,7 +354,7 @@ mod tests {
         let _spawned_task = tokio::task::spawn(emulate_rest_connector(listener));
 
         let schema = SCHEMA.replace(
-            "https://ipinfo.io/",
+            "https://ipinfo.io",
             &format!("http://127.0.0.1:{}/", address.port()),
         );
 

diff --git a/apollo-router/src/query_planner/bridge_query_planner.rs b/apollo-router/src/query_planner/bridge_query_planner.rs
@@ -482,6 +482,10 @@ impl BridgeQueryPlanner {
                     node.generate_connector_plan(&self.subgraph_schemas, &self.subgraph_planners)
                         .await?;
                 }
+                tracing::debug!(
+                    query = original_query,
+                    plan = serde_json::to_string(&plan.data.query_plan.node).unwrap()
+                );
                 plan
             }
             Err(err) => {

diff --git a/apollo-router/src/query_planner/fetch.rs b/apollo-router/src/query_planner/fetch.rs
@@ -515,9 +515,10 @@ impl FetchNode {
         subgraph_planners: &HashMap<String, Arc<Planner<QueryPlanResult>>>,
     ) -> Result<(), QueryPlannerError> {
         if let Some(planner) = subgraph_planners.get(&self.service_name) {
-            println!(
+            tracing::debug!(
                 "planning for subgraph '{}' and query '{}'",
-                self.service_name, self.operation
+                self.service_name,
+                self.operation
             );
 
             let (operation, magic_finder_field) =
@@ -526,7 +527,7 @@ impl FetchNode {
                     None => (self.operation.clone(), None),
                 };
 
-            println!(
+            tracing::debug!(
                 "replaced with operation(magic finder field={magic_finder_field:?}): {operation}"
             );
             match planner

diff --git a/examples/connectors/starstuff.graphql b/examples/connectors/starstuff.graphql
@@ -10,7 +10,7 @@ schema
     directives: [
       {
         name: "sourceAPI"
-        args: { name: "ipinfo", http: { baseURL: "https://ipinfo.io/" } }
+        args: { name: "ipinfo", http: { baseURL: "https://ipinfo.io" } }
       }
     ]
   ) {