Skip to content

Commit f87e2c6

Browse files
JamyDevclaude
andcommitted
fix(orchestrator): use single consumer group for all stages
One consumer group ("orchestrator") for all topics in the service, matching the convention that per-stage groups are unnecessary unless instances are split by stage. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent a48e9da commit f87e2c6

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

submitqueue/orchestrator/pipeline.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var Stages = []pipeline.Stage[Deps]{
8989
{
9090
Key: topickey.TopicKeyStart,
9191
Name: "start",
92-
ConsumerGroup: "orchestrator-start",
92+
ConsumerGroup: "orchestrator",
9393
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
9494
return start.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
9595
},
@@ -100,7 +100,7 @@ var Stages = []pipeline.Stage[Deps]{
100100
{
101101
Key: topickey.TopicKeyCancel,
102102
Name: "cancel",
103-
ConsumerGroup: "orchestrator-cancel",
103+
ConsumerGroup: "orchestrator",
104104
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
105105
return cancel.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
106106
},
@@ -111,7 +111,7 @@ var Stages = []pipeline.Stage[Deps]{
111111
{
112112
Key: topickey.TopicKeyValidate,
113113
Name: "validate",
114-
ConsumerGroup: "orchestrator-validate",
114+
ConsumerGroup: "orchestrator",
115115
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
116116
return validate.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, d.ChangeProvider, d.Validator, runwaymq.TopicKeyMergeConflictCheck, sc.TopicKey, sc.ConsumerGroup), nil
117117
},
@@ -122,7 +122,7 @@ var Stages = []pipeline.Stage[Deps]{
122122
{
123123
Key: runwaymq.TopicKeyMergeConflictCheckSignal,
124124
Name: "merge-conflict-check-signal",
125-
ConsumerGroup: "orchestrator-mergeconflictsignal",
125+
ConsumerGroup: "orchestrator",
126126
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
127127
return mergeconflictsignal.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
128128
},
@@ -133,7 +133,7 @@ var Stages = []pipeline.Stage[Deps]{
133133
{
134134
Key: topickey.TopicKeyBatch,
135135
Name: "batch",
136-
ConsumerGroup: "orchestrator-batch",
136+
ConsumerGroup: "orchestrator",
137137
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
138138
return batch.NewController(d.Logger, d.Scope, sc.Registry, d.Counter, d.Storage, d.Analyzer, sc.TopicKey, sc.ConsumerGroup), nil
139139
},
@@ -144,7 +144,7 @@ var Stages = []pipeline.Stage[Deps]{
144144
{
145145
Key: topickey.TopicKeySpeculate,
146146
Name: "speculate",
147-
ConsumerGroup: "orchestrator-speculate",
147+
ConsumerGroup: "orchestrator",
148148
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
149149
return speculate.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
150150
},
@@ -155,7 +155,7 @@ var Stages = []pipeline.Stage[Deps]{
155155
{
156156
Key: topickey.TopicKeyBuild,
157157
Name: "build",
158-
ConsumerGroup: "orchestrator-build",
158+
ConsumerGroup: "orchestrator",
159159
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
160160
return build.NewController(d.Logger, d.Scope, d.Storage, d.BuildRunner, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
161161
},
@@ -166,7 +166,7 @@ var Stages = []pipeline.Stage[Deps]{
166166
{
167167
Key: topickey.TopicKeyBuildSignal,
168168
Name: "buildsignal",
169-
ConsumerGroup: "orchestrator-buildsignal",
169+
ConsumerGroup: "orchestrator",
170170
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
171171
return buildsignal.NewController(d.Logger, d.Scope, d.Storage, d.BuildRunner, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
172172
},
@@ -177,7 +177,7 @@ var Stages = []pipeline.Stage[Deps]{
177177
{
178178
Key: topickey.TopicKeyMerge,
179179
Name: "submitqueue-merge",
180-
ConsumerGroup: "orchestrator-merge",
180+
ConsumerGroup: "orchestrator",
181181
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
182182
return merge.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, runwaymq.TopicKeyMerge, sc.TopicKey, sc.ConsumerGroup), nil
183183
},
@@ -188,7 +188,7 @@ var Stages = []pipeline.Stage[Deps]{
188188
{
189189
Key: runwaymq.TopicKeyMergeSignal,
190190
Name: "merge-signal",
191-
ConsumerGroup: "orchestrator-mergesignal",
191+
ConsumerGroup: "orchestrator",
192192
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
193193
return mergesignal.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
194194
},
@@ -199,7 +199,7 @@ var Stages = []pipeline.Stage[Deps]{
199199
{
200200
Key: topickey.TopicKeyConclude,
201201
Name: "conclude",
202-
ConsumerGroup: "orchestrator-conclude",
202+
ConsumerGroup: "orchestrator",
203203
New: func(d Deps, sc pipeline.StageContext) (consumer.Controller, error) {
204204
return conclude.NewController(d.Logger, d.Scope, d.Storage, sc.Registry, sc.TopicKey, sc.ConsumerGroup), nil
205205
},

0 commit comments

Comments
 (0)