Skip to content

Commit 5c4db3f

Browse files
committed
fix(webapp): carry-guard column reaches the chart points, Total naming in the UI
The sampled guard was queried but dropped when rows became chart points, so the back-fill guard always read zero and pre-cap history was still overwritten; the guard column is now copied onto each point. User-visible strings move from Combined to Total, matching the perKey/total vocabulary.
1 parent 5de3be5 commit 5c4db3f

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

  • apps/webapp/app
    • components/queues
    • routes
      • _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam
      • _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ export function QueueMetricChart({
170170
};
171171
const hasSamples = sampleCountColumn ? toNumber(r[sampleCountColumn]) > 0 : true;
172172
for (const s of series) point[s.key] = hasSamples ? toNumber(r[s.key]) : null;
173+
if (carryBackfillGuard) point[carryBackfillGuard] = toNumber(r[carryBackfillGuard]);
173174
return point;
174175
})
175176
.filter((p) => Number.isFinite(p.bucket));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ function QueuesWithMetricsView() {
903903
}
904904
content={
905905
<>
906-
Combined limit: at most{" "}
906+
Total limit: at most{" "}
907907
{Math.min(
908908
queue.concurrency.combined.current,
909909
environment.concurrencyLimit
@@ -1997,7 +1997,7 @@ function ClassicQueuesView() {
19971997
}
19981998
content={
19991999
<>
2000-
Combined limit: at most{" "}
2000+
Total limit: at most{" "}
20012001
{Math.min(
20022002
queue.concurrency.combined.current,
20032003
environment.concurrencyLimit

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ function OverviewCharts({
488488
/>
489489
{hasTotalLimit ? (
490490
<QueueDetailChartCard
491-
title="Combined concurrency"
491+
title="Total concurrency"
492492
info={
493493
<>
494494
Runs in flight across ALL concurrency keys (
@@ -506,7 +506,7 @@ function OverviewCharts({
506506
timeRange={timeRange}
507507
queueName={queueName}
508508
series={[
509-
{ key: "cap", label: "Combined limit", color: COLORS.limit },
509+
{ key: "cap", label: "Total limit", color: COLORS.limit },
510510
{ key: "running", label: "Running", color: COLORS.running },
511511
]}
512512
thresholdStroke={{

0 commit comments

Comments
 (0)