Merge pull request 'Hold a leaf delivery to three minutes (hq ADR 0304 decision 4, issue 525)' (#241) from feat/525-leaf-budget-three-minutes into main

cmd/mesh-controller/doctor.go

@@ -122,8 +122,8 @@ var probeRegistry = []probe{
 		Kind: kindDeliveryStalled, Phase: 3, run: probeDeliveries},
 	// The delivery budgets (novox/hq ADR 0282 decision 7): the newest delivery of each class within its budget,
 	// read from mesh-delivery's `times`; a measurement said, never a delivery held.
-	{ID: probeBudgetsID, Asserts: "the newest delivery of a leaf module ran on every machine within five minutes of " +
-		"its merge, and of a core module within ten: mesh-delivery's `times`", From: "ADR 0282",
+	{ID: probeBudgetsID, Asserts: "the newest delivery of a leaf module ran on every machine within three minutes of " +
+		"its merge, and of a core module within ten: mesh-delivery's `times`", From: "ADR 0282, ADR 0304",
 		Kind: kindOverBudget, Phase: 3, run: probeBudgets},
 	// A client of the bus reconnecting in a loop (novox/hq issue 327), from the server's record of closed
 	// connections, which the bus's own module reads.

cmd/mesh-controller/over_budget.go

@@ -17,8 +17,8 @@ import (
 
 // A delivery over its budget is loud (novox/hq ADR 0282 decision 7, issue 382): the self-check reads
 // mesh-delivery's `times` and raises the warning `delivery.<class>.over-budget` when the newest delivery of a
-// class whose delivery time is known took longer than its class's budget — five minutes for a leaf module, ten
-// for a core module — naming the delivery and its longest phase. It clears when the next delivery of that class
+// class whose delivery time is known took longer than its class's budget — three minutes for a leaf module (ADR
+// 0304 decision 4), ten for a core module — naming the delivery and its longest phase. It clears when the next delivery of that class
 // lands within its budget. Measurement only: the condition says, it never holds or acts on a delivery.
 
 // probeBudgetsID is the probe that reads the delivery times.
@@ -27,8 +27,9 @@ const probeBudgetsID = "D16"
 // kindOverBudget is what a delivery over its class's budget raises.
 const kindOverBudget = "over-budget"
 
-// deliveryBudgets are the budgets by class (ADR 0282 decision 1); the probe raises nothing for another class.
-var deliveryBudgets = map[string]time.Duration{inventory.ClassLeaf: 5 * time.Minute, inventory.ClassCore: 10 * time.Minute}
+// deliveryBudgets are the budgets by class (ADR 0282 decision 1, the leaf's as ADR 0304 decision 4 changed it);
+// the probe raises nothing for another class.
+var deliveryBudgets = map[string]time.Duration{inventory.ClassLeaf: 3 * time.Minute, inventory.ClassCore: 10 * time.Minute}
 
 // timesAnswer is what mesh-delivery's `times` answers, as far as the probe reads it.
 type timesAnswer struct {

cmd/mesh-controller/over_budget_test.go

@@ -10,11 +10,12 @@ import (
 	"github.com/novox/mesh-controller/internal/inventory"
 )
 
-// A leaf delivery of 5 minutes 10 seconds raises delivery.leaf.over-budget naming its longest phase; one of
-// exactly five minutes, a core one of nine and a class without a budget raise nothing (ADR 0282 decision 7).
+// A leaf delivery of 3 minutes 10 seconds raises delivery.leaf.over-budget naming its longest phase; one of
+// exactly three minutes, a core one of nine and a class without a budget raise nothing (ADR 0282 decision 7,
+// the leaf's budget as ADR 0304 decision 4 changed it).
 func TestADeliveryOverItsBudgetIsLoud(t *testing.T) {
 	a := &timesAnswer{Classes: []timesClass{
-		{Class: inventory.ClassLeaf, Latest: &timesLatest{ID: "novox/mesh-catalog@abc", TookMS: (5*time.Minute + 10*time.Second).Milliseconds(),
+		{Class: inventory.ClassLeaf, Latest: &timesLatest{ID: "novox/mesh-catalog@abc", TookMS: (3*time.Minute + 10*time.Second).Milliseconds(),
 			Longest: "judgement 2m40s"}},
 		{Class: inventory.ClassCore, Latest: &timesLatest{ID: "novox/mesh-controller@def", TookMS: (9 * time.Minute).Milliseconds(),
 			Longest: "build 1m"}},
@@ -30,7 +31,7 @@ func TestADeliveryOverItsBudgetIsLoud(t *testing.T) {
 		t.Fatalf("the condition names its delivery and longest phase: %s — %s", o.Key(), o.Summary)
 	}
 	// The next leaf delivery within its budget clears it: the probe raises nothing for the class.
-	a.Classes[0].Latest = &timesLatest{ID: "novox/mesh-catalog@ghi", TookMS: (5 * time.Minute).Milliseconds()}
+	a.Classes[0].Latest = &timesLatest{ID: "novox/mesh-catalog@ghi", TookMS: (3 * time.Minute).Milliseconds()}
 	if obs := overBudgetObservations(a); len(obs) != 0 {
 		t.Fatalf("a delivery of exactly its budget is within it: %+v", obs)
 	}

internal/catalogue/delivery_seat.go

@@ -21,7 +21,7 @@ func deliveryVerbs() []Verb {
 		// Delivery time against the delivery budgets (novox/hq ADR 0282): what probe D16 reads, optional until its
 		// holder serves it.
 		{Name: "times", Description: "Delivery time: from a merge to every machine of its walk running the build. " +
-			"Each class's delivery budget (a leaf module five minutes, a core module ten), the last days' median and " +
+			"Each class's delivery budget (a leaf module three minutes, a core module ten), the last days' median and " +
 			"worst, how many within and over, the newest delivery of each class, every delivery over its budget with its " +
 			"longest phase, and the delivered ones whose time is not known. Given a delivery's id, its time phase by phase.",
 			Input: schema(map[string]string{"days": "how many days back (default 7)", "id": "one delivery's id: its phases"}, nil),