From 10342bcba74cedea79b84d3b5f5dc27a8333fd17 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 11 Dec 2023 16:28:15 +0100 Subject: [PATCH 1/4] qol: move a couple of printlns to tracing debug --- .../src/plugins/connectors/subgraph_connector.rs | 6 +++--- apollo-router/src/query_planner/bridge_query_planner.rs | 9 +++++++++ apollo-router/src/query_planner/fetch.rs | 7 ++++--- examples/connectors/starstuff.graphql | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/apollo-router/src/plugins/connectors/subgraph_connector.rs b/apollo-router/src/plugins/connectors/subgraph_connector.rs index 955b1c8c70..b3513ae5ec 100644 --- 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,7 @@ where let subgraph_response = connector .map_http_responses(responses, context, hack_entity_response_key) // 4. .await?; - dbg!(&subgraph_response.response.body().data); + // dbg!(&subgraph_response.response.body().data); Ok(subgraph_response) @@ -335,7 +335,7 @@ mod tests { .body(String::new()) .unwrap()) }; - println!("generated service response: {res:?}"); + tracing::debug!("generated service response: {res:?}"); res } diff --git a/apollo-router/src/query_planner/bridge_query_planner.rs b/apollo-router/src/query_planner/bridge_query_planner.rs index bafc9d746a..b25ab1e376 100644 --- a/apollo-router/src/query_planner/bridge_query_planner.rs +++ b/apollo-router/src/query_planner/bridge_query_planner.rs @@ -482,6 +482,15 @@ 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() + ); + + println!( + "{}", + serde_json::to_string_pretty(&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 index 8735a3e7f0..4fc6d9281a 100644 --- 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>>, ) -> 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 index 9ee940aff0..e139743eba 100644 --- 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" } } } ] ) { From 31b24ecf4cf48564895171a1521c8b3e9ddf92f7 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 11 Dec 2023 16:29:34 +0100 Subject: [PATCH 2/4] wip --- apollo-router/src/query_planner/bridge_query_planner.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apollo-router/src/query_planner/bridge_query_planner.rs b/apollo-router/src/query_planner/bridge_query_planner.rs index b25ab1e376..95f5517361 100644 --- a/apollo-router/src/query_planner/bridge_query_planner.rs +++ b/apollo-router/src/query_planner/bridge_query_planner.rs @@ -486,11 +486,6 @@ impl BridgeQueryPlanner { query = original_query, plan = serde_json::to_string(&plan.data.query_plan.node).unwrap() ); - - println!( - "{}", - serde_json::to_string_pretty(&plan.data.query_plan.node).unwrap() - ); plan } Err(err) => { From ddd5dc5e4b74022fbed52cd780fe6bd5e6046790 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 11 Dec 2023 16:31:41 +0100 Subject: [PATCH 3/4] restore data dbg --- apollo-router/src/plugins/connectors/subgraph_connector.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apollo-router/src/plugins/connectors/subgraph_connector.rs b/apollo-router/src/plugins/connectors/subgraph_connector.rs index b3513ae5ec..8541d37da8 100644 --- a/apollo-router/src/plugins/connectors/subgraph_connector.rs +++ b/apollo-router/src/plugins/connectors/subgraph_connector.rs @@ -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) From a192b5ec180793881f43cd7a172e765d8c6dd2d8 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Tue, 12 Dec 2023 09:57:28 +0100 Subject: [PATCH 4/4] update mock now that ive changed the uri --- apollo-router/src/plugins/connectors/subgraph_connector.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apollo-router/src/plugins/connectors/subgraph_connector.rs b/apollo-router/src/plugins/connectors/subgraph_connector.rs index 8541d37da8..d4b3f4fdc3 100644 --- a/apollo-router/src/plugins/connectors/subgraph_connector.rs +++ b/apollo-router/src/plugins/connectors/subgraph_connector.rs @@ -354,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()), );