feat: active cpu time (#22331)

active cpu time Co-authored-by: Alexander Spicer <aspicer@surfer-172-30-3-221-hotspot.internet-for-guests.com>
PostHog · May 16, 2024 · ad3d6d7 · ad3d6d7
1 parent 7446568
commit ad3d6d7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -1542,6 +1542,9 @@
         "ClickhouseQueryStatus": {
             "additionalProperties": false,
             "properties": {
+                "active_cpu_time": {
+                    "type": "integer"
+                },
                 "bytes_read": {
                     "type": "integer"
                 },
@@ -1555,7 +1558,7 @@
                     "type": "integer"
                 }
             },
-            "required": ["bytes_read", "rows_read", "estimated_rows_total", "time_elapsed"],
+            "required": ["bytes_read", "rows_read", "estimated_rows_total", "time_elapsed", "active_cpu_time"],
             "type": "object"
         },
         "CohortPropertyFilter": {

diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
@@ -932,6 +932,7 @@ export type ClickhouseQueryStatus = {
     rows_read: integer
     estimated_rows_total: integer
     time_elapsed: integer
+    active_cpu_time: integer
 }
 
 export type QueryStatus = {

diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -119,6 +119,11 @@ export function InsightLoadingStateWithLoadingBar({
     }, [insightPollResponse])
     const bytesPerSecond = (bytesRead / (secondsElapsed || 1)) * 1000
 
+    const cpuUtilization =
+        (insightPollResponse?.status?.query_progress?.active_cpu_time || 0) /
+        (insightPollResponse?.status?.query_progress?.time_elapsed || 1) /
+        10000
+
     return (
         <div className="insight-empty-state warning">
             <div className="empty-state-inner">
@@ -130,6 +135,8 @@ export function InsightLoadingStateWithLoadingBar({
                             {humanFriendlyNumber(rowsRead || 0, 0)} rows
                             <br />
                             {humanFileSize(bytesRead || 0)} ({humanFileSize(bytesPerSecond || 0)}/s)
+                            <br />
+                            CPU {humanFriendlyNumber(cpuUtilization, 0)}%
                         </>
                     )}
                 </p>

diff --git a/posthog/clickhouse/client/execute_async.py b/posthog/clickhouse/client/execute_async.py
@@ -97,7 +97,8 @@ def get_query_status(self, show_progress=False) -> QueryStatus:
                 read_rows,
                 read_bytes,
                 total_rows_approx,
-                elapsed
+                elapsed,
+                ProfileEvents['OSCPUVirtualTimeMicroseconds'] as OSCPUVirtualTimeMicroseconds
             FROM clusterAllReplicas(posthog, system.processes)
             WHERE query_id like %(query_id)s
             """
@@ -116,6 +117,7 @@ def get_query_status(self, show_progress=False) -> QueryStatus:
                         "rows_read": noNaNInt(result[2]),
                         "estimated_rows_total": noNaNInt(result[4]),
                         "time_elapsed": noNaNInt(result[5]),
+                        "active_cpu_time": noNaNInt(result[6]),
                     }
                     for result in results
                 }
@@ -127,12 +129,14 @@ def get_query_status(self, show_progress=False) -> QueryStatus:
                     "rows_read": 0,
                     "estimated_rows_total": 0,
                     "time_elapsed": 0,
+                    "active_cpu_time": 0,
                 }
                 for single_query_progress in clickhouse_query_progress_dict.values():
                     query_progress["bytes_read"] += single_query_progress["bytes_read"]
                     query_progress["rows_read"] += single_query_progress["rows_read"]
                     query_progress["estimated_rows_total"] += single_query_progress["estimated_rows_total"]
                     query_progress["time_elapsed"] += single_query_progress["time_elapsed"]
+                    query_progress["active_cpu_time"] += single_query_progress["active_cpu_time"]
                 query_status.query_progress = ClickhouseQueryStatus(**query_progress)
 
             except Exception as e:

diff --git a/posthog/schema.py b/posthog/schema.py
@@ -182,6 +182,7 @@ class ClickhouseQueryStatus(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    active_cpu_time: int
     bytes_read: int
     estimated_rows_total: int
     rows_read: int