Skip to content

feat(speculate): emit metric when bypass commits #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behinddwalls merged 2 commits into from
Sep 2, 2026
+14 −3
Merged

feat(speculate): emit metric when bypass commits #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f46083
feat(speculate): emit metric when bypass commits
behinddwalls Sep 1, 2026
a100a3f
Merge branch 'main' into blrd
behinddwalls Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion submitqueue/orchestrator/controller/speculate/finalize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,14 @@ func (c *Controller) finalize(ctx context.Context, snap *snapshot) error {
continue
}

bypassed := false
if decision == outcomeMerge {
// The winning path carries the head out of the queue; its
// siblings cannot help it any more and are still holding CI
// slots the rest of the queue could use.
winner, ok := mergeablePath(set, *snap)
if !ok {
winner, _ = bypassablePath(batch, set, *snap)
winner, bypassed = bypassablePath(batch, set, *snap)
}
if supersede(&set, winner.ID, nowMs) {
snap.pathSets[batch.ID] = set
Expand All @@ -119,6 +120,9 @@ func (c *Controller) finalize(ctx context.Context, snap *snapshot) error {
// not be offered a head whose set we could not write.
continue
}
if bypassed {
metrics.NamedCounter(c.metricsScope, opName, "bypass", 1)
}
c.recordOutcome(snap, batch.ID, decision)
decided++
}
Expand Down
11 changes: 9 additions & 2 deletions submitqueue/orchestrator/controller/speculate/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ type runHarness struct {
logs []entity.RequestLog
// failTopic, when set, makes every publish to that topic fail.
failTopic string
// metrics records the controller's emitted counters for outcome assertions.
metrics tally.TestScope
}

// failPublishTo makes publishes to one topic fail, leaving the others working,
Expand Down Expand Up @@ -117,7 +119,7 @@ func (h *runHarness) run(triggerID string) error {
func newRunHarness(t *testing.T, ctrl *gomock.Controller, spec *scriptedSpeculator, inFlight []entity.Batch) *runHarness {
t.Helper()

h := &runHarness{spec: spec}
h := &runHarness{spec: spec, metrics: tally.NewTestScope("test", nil)}

h.batches = storagemock.NewMockBatchStore(ctrl)
for _, b := range inFlight {
Expand Down Expand Up @@ -193,7 +195,7 @@ func newRunHarness(t *testing.T, ctrl *gomock.Controller, spec *scriptedSpeculat
require.NoError(t, err)

h.controller = NewController(
zaptest.NewLogger(t).Sugar(), tally.NoopScope, staticStorageFactory{store: store},
zaptest.NewLogger(t).Sugar(), h.metrics, staticStorageFactory{store: store},
staticSpeculatorFactory{s: spec}, registry, topickey.TopicKeySpeculate, "orchestrator-speculate",
)
return h
Expand Down Expand Up @@ -1547,6 +1549,7 @@ func TestRun_MergingHeadReportsSpeculatedAndNoWait(t *testing.T) {
assert.Equal(t, entity.RequestLogTypeStatus, h.logs[0].Type)
assert.Equal(t, entity.RequestStatusSpeculated, h.logs[0].Status)
assert.Equal(t, head, h.logs[0].Metadata["batch_id"])
assert.NotContains(t, h.metrics.Snapshot().Counters(), "test.speculate_controller.process.bypass+")
}

func TestRun_BypassesUnsettledDependenciesWithFullCoverage(t *testing.T) {
Expand Down Expand Up @@ -1578,6 +1581,10 @@ func TestRun_BypassesUnsettledDependenciesWithFullCoverage(t *testing.T) {
assert.Zero(t, h.spec.calls)
require.Len(t, h.logs, 1)
assert.Equal(t, entity.RequestStatusSpeculated, h.logs[0].Status)

counter, ok := h.metrics.Snapshot().Counters()["test.speculate_controller.process.bypass+"]
require.True(t, ok)
assert.EqualValues(t, 1, counter.Value())
}

// The merge stage publishes landing as its first act on the dispatch. Both
Expand Down
Loading