rename(webapp,clickhouse): concurrency vocabulary for the unlaunched metrics surfaces

The Query tables become concurrency_metrics and concurrency_metrics_by_key,
and the combined_* columns become total_* across the query schemas, the
insert mapping, the ClickHouse migration, and every TRQL chart, matching
the perKey/total shape the SDK will expose. Internal names (stream keys,
env vars, ClickHouse table names) are unchanged. None of these surfaces
have launched, so this is the last free moment for the rename.

Author: matt-aitken

apps/webapp/app/components/queues/QueueMetricCards.tsx

@@ -340,7 +340,7 @@ export function QueueSidebarStats({
   };
 
   const { rows, showLoading } = useQueueMetric(
-    `SELECT max(max_queued) AS peak_queued,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS worst_p95\nFROM queue_metrics`,
+    `SELECT max(max_queued) AS peak_queued,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS worst_p95\nFROM concurrency_metrics`,
     { ids, timeRange, queueName, defaultPeriod }
   );
   const row = rows[0];

apps/webapp/app/presenters/v3/BuiltInDashboards.server.ts

@@ -634,7 +634,7 @@ const queuesDashboard: BuiltInDashboard = {
       "t-pressure": { title: "Queue pressure", query: "", display: { type: "title" } },
       pressure: {
         title: "Queue pressure",
-        query: `SELECT queue,\n  argMax(max_running, bucket_start) AS running,\n  argMax(max_queued, bucket_start) AS queued,\n  argMax(max_limit, bucket_start) AS limit,\n  running + queued AS demand,\n  max(max_queued) AS peak_queued,\n  sum(throttled_count) AS throttled,\n  multiIf(running >= limit AND queued > 0, 'queue-limited', queued > 0, 'backlogged', 'healthy') AS status\nFROM queue_metrics\nGROUP BY queue\nORDER BY peak_queued DESC`,
+        query: `SELECT queue,\n  argMax(max_running, bucket_start) AS running,\n  argMax(max_queued, bucket_start) AS queued,\n  argMax(max_limit, bucket_start) AS limit,\n  running + queued AS demand,\n  max(max_queued) AS peak_queued,\n  sum(throttled_count) AS throttled,\n  multiIf(running >= limit AND queued > 0, 'queue-limited', queued > 0, 'backlogged', 'healthy') AS status\nFROM concurrency_metrics\nGROUP BY queue\nORDER BY peak_queued DESC`,
         display: {
           type: "table",
           prettyFormatting: true,
@@ -644,7 +644,7 @@ const queuesDashboard: BuiltInDashboard = {
       "t-trends": { title: "Per-queue trends", query: "", display: { type: "title" } },
       "running-q": {
         title: "Running by queue",
-        query: `SELECT timeBucket() AS t, queue, max(max_running) AS running\nFROM queue_metrics\nGROUP BY t, queue\nORDER BY t`,
+        query: `SELECT timeBucket() AS t, queue, max(max_running) AS running\nFROM concurrency_metrics\nGROUP BY t, queue\nORDER BY t`,
         // Grouped gauge: carry each queue's running across idle buckets (per-group LOCF).
         fillGaps: true,
         display: {
@@ -661,7 +661,7 @@ const queuesDashboard: BuiltInDashboard = {
       },
       "queued-q": {
         title: "Queue depth (backlog) by queue",
-        query: `SELECT timeBucket() AS t, queue, max(max_queued) AS queued\nFROM queue_metrics\nGROUP BY t, queue\nORDER BY t`,
+        query: `SELECT timeBucket() AS t, queue, max(max_queued) AS queued\nFROM concurrency_metrics\nGROUP BY t, queue\nORDER BY t`,
         // Grouped gauge: carry each queue's backlog across idle buckets (per-group LOCF).
         fillGaps: true,
         display: {
@@ -678,7 +678,7 @@ const queuesDashboard: BuiltInDashboard = {
       },
       "throttled-q": {
         title: "Throttled buckets by queue",
-        query: `SELECT timeBucket() AS t, queue, sum(throttled_count) AS throttled\nFROM queue_metrics\nGROUP BY t, queue\nORDER BY t`,
+        query: `SELECT timeBucket() AS t, queue, sum(throttled_count) AS throttled\nFROM concurrency_metrics\nGROUP BY t, queue\nORDER BY t`,
         // Grouped counter: per-group zero-fill so idle buckets read 0, not a gap.
         fillGaps: true,
         display: {
@@ -697,7 +697,7 @@ const queuesDashboard: BuiltInDashboard = {
         title: "Enqueued vs started",
         // Counter states merge per queue, then sum outside: a single merge across queues
         // mixes unrelated odometers and returns wrong totals.
-        query: `SELECT t, sum(enq) AS enqueued, sum(st) AS started\nFROM (\n  SELECT timeBucket() AS t, queue,\n    deltaSumTimestampMerge(enqueue_delta) AS enq,\n    deltaSumTimestampMerge(started_delta) AS st\n  FROM queue_metrics\n  GROUP BY t, queue\n)\nGROUP BY t\nORDER BY t`,
+        query: `SELECT t, sum(enq) AS enqueued, sum(st) AS started\nFROM (\n  SELECT timeBucket() AS t, queue,\n    deltaSumTimestampMerge(enqueue_delta) AS enq,\n    deltaSumTimestampMerge(started_delta) AS st\n  FROM concurrency_metrics\n  GROUP BY t, queue\n)\nGROUP BY t\nORDER BY t`,
         display: {
           type: "chart",
           chartType: "line",

apps/webapp/app/presenters/v3/reports/health/health-data.ts

@@ -212,7 +212,7 @@ function queueWorstQuery(): string {
   return `SELECT
   queue AS name,
   argMax(max_queued, bucket_start) AS latest_queued
-FROM queue_metrics
+FROM concurrency_metrics
 GROUP BY queue
 ORDER BY latest_queued DESC
 LIMIT 20`;
@@ -228,7 +228,7 @@ FROM (
   SELECT
     deltaSumTimestampMerge(dlq_delta) AS dlq,
     argMax(max_queued, bucket_start) AS latest_queued
-  FROM queue_metrics
+  FROM concurrency_metrics
   GROUP BY queue
 )`;
 }

apps/webapp/app/presenters/v3/reports/report-registry.ts

@@ -4,7 +4,7 @@ import { loadHealthInput } from "./health/health-data";
 import { type ReportViewModel } from "./report-view-model";
 
 /** A query table a report may read. Same table names the query API authorizes against. */
-export type ReportQueryTable = "runs" | "env_metrics" | "queue_metrics";
+export type ReportQueryTable = "runs" | "env_metrics" | "concurrency_metrics";
 
 export type ReportLoader<TInput> = {
   /** Authorization metadata: the route derives its per-table JWT scope check from this. */
@@ -19,7 +19,7 @@ function defineReport<TInput>(loader: ReportLoader<TInput>): ReportLoader<unknow
 
 export const REPORT_REGISTRY: Record<string, ReportLoader<unknown>> = {
   health: defineReport({
-    tables: ["runs", "env_metrics", "queue_metrics"],
+    tables: ["runs", "env_metrics", "concurrency_metrics"],
     load: (env, period) => loadHealthInput(env, period),
     interpret: interpretHealth,
   }),

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx

@@ -128,7 +128,7 @@ const SearchParamsSchema = z.object({
 
 // The live "Queued" / "Running" header blocks poll ClickHouse on a short cadence so they stay
 // current after first paint. They read the env-wide gauges from env_metrics (the env-level rollup
-// of queue_metrics, cheapest for a dimension-free query), always over a fixed 15m window regardless
+// of concurrency_metrics, cheapest for a dimension-free query), always over a fixed 15m window regardless
 // of the chart/table period, and are NOT scoped to the visible queue set (the blocks are env-wide).
 const QUEUE_LIVE_BLOCKS_PERIOD = "15m";
 const QUEUE_LIVE_BLOCKS_QUERY =
@@ -1670,7 +1670,7 @@ function QueueHealthBadge(health: QueueHealth) {
   );
 }
 
-// The `queue_metrics`-prefixed key a queue is stored under (task queues are prefixed `task/`).
+// The metrics-row key a queue is stored under (task queues are prefixed `task/`).
 function queueMetricsKey(queue: { type: string; name: string }): string {
   return `${queue.type === "task" ? "task/" : ""}${queue.name}`;
 }

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam/route.tsx

@@ -266,7 +266,7 @@ export default function Page() {
   // The Concurrency keys tab exists only for queues with key activity: live keys in the
   // ckIndex, or nonzero CK history in the selected range (one cached scalar query decides).
   const { rows: gateRows, showLoading: gateLoading } = useQueueMetric(
-    `SELECT max(max_ck_backlogged) AS peak_keys, max(max_ck_wait_ms) AS peak_wait\nFROM queue_metrics`,
+    `SELECT max(max_ck_backlogged) AS peak_keys, max(max_ck_wait_ms) AS peak_wait\nFROM concurrency_metrics`,
     { ids, timeRange, queueName: fullName }
   );
   const gateRow = gateRows[0];
@@ -463,7 +463,7 @@ function OverviewCharts({
           }
           showLegend
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, max(max_running) AS running, max(max_limit) AS limit\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_running) AS running, max(max_limit) AS limit\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -499,7 +499,7 @@ function OverviewCharts({
             }
             showLegend
             className="aspect-[2/1]"
-            query={`SELECT timeBucket() AS t, max(max_combined_running) AS running, least(max(max_combined_limit), max(max_env_limit)) AS cap\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+            query={`SELECT timeBucket() AS t, max(max_total_running) AS running, least(max(max_total_limit), max(max_env_limit)) AS cap\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
             fillGaps
             minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
             ids={ids}
@@ -521,7 +521,7 @@ function OverviewCharts({
           title="Queue depth"
           info="How many runs are waiting in this queue over time."
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, max(max_queued) AS queued\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_queued) AS queued\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -541,7 +541,7 @@ function OverviewCharts({
           showLegend
           extraLegend={[{ color: "var(--color-warning)", label: "Falling behind" }]}
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t,\n  deltaSumTimestampMerge(enqueue_delta) AS enqueued,\n  deltaSumTimestampMerge(started_delta) AS started\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t,\n  deltaSumTimestampMerge(enqueue_delta) AS enqueued,\n  deltaSumTimestampMerge(started_delta) AS started\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -560,7 +560,7 @@ function OverviewCharts({
           info="How long runs wait before they start."
           showLegend
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[1]) AS p50,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS p95,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[4]) AS p99,\n  sum(wait_ms_count) AS samples\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[1]) AS p50,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS p95,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[4]) AS p99,\n  sum(wait_ms_count) AS samples\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           sampleCountColumn="samples"
@@ -583,7 +583,7 @@ function OverviewCharts({
             </>
           }
           className="aspect-[2/1] sm:col-span-2 sm:aspect-[4/1]"
-          query={`SELECT timeBucket() AS t, sum(throttled_count) AS throttled\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, sum(throttled_count) AS throttled\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -698,7 +698,7 @@ function ConcurrencyKeyCharts({
           title="Keys with backlog"
           info="Keys with runs waiting at once."
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, max(max_ck_backlogged) AS keys\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_ck_backlogged) AS keys\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           ids={ids}
           timeRange={timeRange}
@@ -720,7 +720,7 @@ function ConcurrencyKeyCharts({
             ) : null
           }
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, max(max_ck_wait_ms) AS wait\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_ck_wait_ms) AS wait\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           ids={ids}
           timeRange={timeRange}
@@ -782,7 +782,7 @@ type GroupedKeyChartProps = {
 // search can match keys outside the top 8; then filter by the search and keep the top 8 of those.
 function GroupedKeyChartCard(props: GroupedKeyChartProps) {
   const { rows, showLoading, failed } = useQueueMetric(
-    `SELECT concurrency_key, ${props.rankExpr} AS peak\nFROM queue_metrics_by_key\nGROUP BY concurrency_key\nORDER BY peak DESC\nLIMIT 50`,
+    `SELECT concurrency_key, ${props.rankExpr} AS peak\nFROM concurrency_metrics_by_key\nGROUP BY concurrency_key\nORDER BY peak DESC\nLIMIT 50`,
     { ids: props.ids, timeRange: props.timeRange, queueName: props.queueName }
   );
   const keyFilter = props.keyFilter;
@@ -810,7 +810,7 @@ function GroupedKeySeries({
 }: GroupedKeyChartProps & { keys: string[] }) {
   const inList = keys.map((k) => `'${trqlString(k)}'`).join(", ");
   const { rows, showLoading, failed } = useQueueMetric(
-    `SELECT timeBucket() AS t, concurrency_key, ${seriesExpr} AS v\nFROM queue_metrics_by_key\nWHERE concurrency_key IN (${inList})\nGROUP BY t, concurrency_key\nORDER BY t`,
+    `SELECT timeBucket() AS t, concurrency_key, ${seriesExpr} AS v\nFROM concurrency_metrics_by_key\nWHERE concurrency_key IN (${inList})\nGROUP BY t, concurrency_key\nORDER BY t`,
     { ids, timeRange, queueName, fillGaps }
   );
 
@@ -1074,7 +1074,7 @@ function KeyDrilldown({
             </>
           }
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, max(max_queued) AS queued, max(max_running) AS running\nFROM queue_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_queued) AS queued, max(max_running) AS running\nFROM concurrency_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -1089,7 +1089,7 @@ function KeyDrilldown({
         <QueueDetailChartCard
           title={`Key ${keyName}: throughput`}
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, deltaSumTimestampMerge(started_delta) AS started\nFROM queue_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, deltaSumTimestampMerge(started_delta) AS started\nFROM concurrency_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           ids={ids}
@@ -1100,7 +1100,7 @@ function KeyDrilldown({
         <QueueDetailChartCard
           title={`Key ${keyName}: mean scheduling delay`}
           className="aspect-[2/1]"
-          query={`SELECT timeBucket() AS t, if(sum(wait_ms_count) > 0, round(sum(wait_ms_sum) / sum(wait_ms_count)), 0) AS wait, sum(wait_ms_count) AS samples\nFROM queue_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, if(sum(wait_ms_count) > 0, round(sum(wait_ms_sum) / sum(wait_ms_count)), 0) AS wait, sum(wait_ms_count) AS samples\nFROM concurrency_metrics_by_key\nWHERE ${pin}\nGROUP BY t\nORDER BY t`}
           fillGaps
           minBucketSeconds={SYNCED_CHART_MIN_BUCKET_SECONDS}
           sampleCountColumn="samples"
@@ -1145,18 +1145,21 @@ function QueueStats({
   timeRange: TimeRangeParams;
   queueName: string;
 }) {
-  const { rows } = useQueueMetric(`SELECT max(max_queued) AS peak_queued\nFROM queue_metrics`, {
-    ids,
-    timeRange,
-    queueName,
-  });
+  const { rows } = useQueueMetric(
+    `SELECT max(max_queued) AS peak_queued\nFROM concurrency_metrics`,
+    {
+      ids,
+      timeRange,
+      queueName,
+    }
+  );
   const peakQueued = rows[0] ? toNumber(rows[0].peak_queued) : 0;
 
   // Latest gauges from ClickHouse, polled every 15s so the live blocks keep ticking after first
   // paint. Read the newest bucket (largest t); until the first poll lands liveRows is empty and the
   // *Live values stay null, so the blocks show the loader values instead of flashing 0.
   const { rows: liveRows, responseReceivedAt } = useQueueMetric(
-    `SELECT timeBucket() AS t, max(max_running) AS running, max(max_queued) AS queued, max(max_limit) AS q_limit, max(max_ck_wait_ms) AS ck_wait FROM queue_metrics GROUP BY t ORDER BY t`,
+    `SELECT timeBucket() AS t, max(max_running) AS running, max(max_queued) AS queued, max(max_limit) AS q_limit, max(max_ck_wait_ms) AS ck_wait FROM concurrency_metrics GROUP BY t ORDER BY t`,
     {
       ids,
       timeRange: { period: "15m", from: null, to: null },

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.standard.$taskParam/route.tsx

@@ -527,7 +527,7 @@ function TaskActivityCard({
     >
       {view === "queue" ? (
         <QueueMetricChart
-          query={`SELECT timeBucket() AS t, max(max_queued) AS queued\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+          query={`SELECT timeBucket() AS t, max(max_queued) AS queued\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
           fillGaps
           ids={ids}
           timeRange={timeRange}

apps/webapp/app/routes/api.v1.queues.$queueParam.metrics.ts

@@ -51,7 +51,7 @@ export const loader = createLoaderApiRoute(
     findResource: async () => 1, // dummy — the queue name isn't resolved against Postgres
     authorization: {
       action: "read",
-      resource: () => ({ type: "query", id: "queue_metrics" }),
+      resource: () => ({ type: "query", id: "concurrency_metrics" }),
     },
   },
   async ({ params, searchParams, authentication }) => {

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx

@@ -1342,7 +1342,7 @@ function WaitingInQueueBlock({
     responseReceivedAt,
     lastSuccessfulResponseAt,
   } = useQueueMetric(
-    `SELECT timeBucket() AS t, max(max_running) AS running, max(max_queued) AS queued, max(max_limit) AS q_limit\nFROM queue_metrics\nGROUP BY t\nORDER BY t`,
+    `SELECT timeBucket() AS t, max(max_running) AS running, max(max_queued) AS queued, max(max_limit) AS q_limit\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`,
     {
       ids: waiting.ids,
       timeRange: { period: "15m", from: null, to: null },
@@ -1441,7 +1441,7 @@ function WaitingInQueueBlock({
         </div>
         <div className="h-40">
           <QueueMetricChart
-            query={`SELECT timeBucket() AS t,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[1]) AS p50,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS p95\nFROM queue_metrics\nGROUP BY t\nORDER BY t`}
+            query={`SELECT timeBucket() AS t,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[1]) AS p50,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS p95\nFROM concurrency_metrics\nGROUP BY t\nORDER BY t`}
             series={[
               { key: "p50", label: "p50", color: QUEUE_METRIC_COLORS.p50 },
               { key: "p95", label: "p95", color: QUEUE_METRIC_COLORS.p95 },