From 32baaa1ee7abf0cc6de8de07b287e1c5a3218c11 Mon Sep 17 00:00:00 2001
From: Edd Robinson <me@edd.io>
Date: Thu, 3 Mar 2022 14:04:34 +0000
Subject: [PATCH] feat: add tracing to field_columns

---
 influxdb_iox/src/influxdb_ioxd/planner.rs |  3 ++-
 query/src/frontend/influxrpc.rs           | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/influxdb_iox/src/influxdb_ioxd/planner.rs b/influxdb_iox/src/influxdb_ioxd/planner.rs
index 5443fe5f4e..76acf2234e 100644
--- a/influxdb_iox/src/influxdb_ioxd/planner.rs
+++ b/influxdb_iox/src/influxdb_ioxd/planner.rs
@@ -121,7 +121,8 @@ impl Planner {
     where
         D: QueryDatabase + 'static,
     {
-        let planner = InfluxRpcPlanner::default();
+        let planner =
+            InfluxRpcPlanner::new().with_execution_context(self.ctx.child_ctx("influxrpc_planner"));
 
         self.ctx
             .run(async move {
diff --git a/query/src/frontend/influxrpc.rs b/query/src/frontend/influxrpc.rs
index 9af0da11a8..ab1ef5d199 100644
--- a/query/src/frontend/influxrpc.rs
+++ b/query/src/frontend/influxrpc.rs
@@ -660,6 +660,7 @@ impl InfluxRpcPlanner {
     where
         D: QueryDatabase + 'static,
     {
+        let ctx = self.ctx.child_ctx("field_columns planning");
         debug!(?rpc_predicate, "planning field_columns");
 
         // Special case predicates that span the entire valid timestamp range
@@ -688,7 +689,13 @@ impl InfluxRpcPlanner {
                 .table_schema(table_name)
                 .context(TableRemovedSnafu { table_name })?;
 
-            if let Some(plan) = self.field_columns_plan(table_name, schema, predicate, chunks)? {
+            if let Some(plan) = self.field_columns_plan(
+                ctx.child_ctx("field_columns plan"),
+                table_name,
+                schema,
+                predicate,
+                chunks,
+            )? {
                 field_list_plan = field_list_plan.append(plan);
             }
         }
@@ -963,6 +970,7 @@ impl InfluxRpcPlanner {
     /// ```
     fn field_columns_plan<C>(
         &self,
+        ctx: IOxExecutionContext,
         table_name: &str,
         schema: Arc<Schema>,
         predicate: &Predicate,
@@ -972,7 +980,7 @@ impl InfluxRpcPlanner {
         C: QueryChunk + 'static,
     {
         let scan_and_filter = self.scan_and_filter(
-            self.ctx.child_ctx("scan_and_filter planning"),
+            ctx.child_ctx("scan_and_filter planning"),
             table_name,
             schema,
             predicate,