Skip to content

Commit 285b221

Browse files
authored
fix: Don't 500 when setting services aren't registered (#3962)
1 parent 62c24ab commit 285b221

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

pkg/api/api.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,16 @@ func (a *API) RegisterRuntimeConfig(runtimeConfigHandler http.HandlerFunc, userL
208208

209209
func (a *API) RegisterTenantSettings(ts *settings.TenantSettings) {
210210
settingsv1connect.RegisterSettingsServiceHandler(a.server.HTTP, ts, a.connectOptionsAuthRecovery()...)
211-
settingsv1connect.RegisterCollectionRulesServiceHandler(a.server.HTTP, ts, a.connectOptionsAuthRecovery()...)
212-
settingsv1connect.RegisterRecordingRulesServiceHandler(a.server.HTTP, ts, a.connectOptionsAuthRecovery()...)
211+
212+
_, isUnimplemented := ts.CollectionRulesServiceHandler.(*settingsv1connect.UnimplementedCollectionRulesServiceHandler)
213+
if !isUnimplemented {
214+
settingsv1connect.RegisterCollectionRulesServiceHandler(a.server.HTTP, ts, a.connectOptionsAuthRecovery()...)
215+
}
216+
217+
_, isUnimplemented = ts.RecordingRulesServiceHandler.(*settingsv1connect.UnimplementedRecordingRulesServiceHandler)
218+
if !isUnimplemented {
219+
settingsv1connect.RegisterRecordingRulesServiceHandler(a.server.HTTP, ts, a.connectOptionsAuthRecovery()...)
220+
}
213221
}
214222

215223
// RegisterOverridesExporter registers the endpoints associated with the overrides exporter.

pkg/settings/settings.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func New(cfg Config, bucket objstore.Bucket, logger log.Logger) (*TenantSettings
4747

4848
ts := &TenantSettings{
4949
CollectionRulesServiceHandler: &settingsv1connect.UnimplementedCollectionRulesServiceHandler{},
50+
RecordingRulesServiceHandler: &settingsv1connect.UnimplementedRecordingRulesServiceHandler{},
5051
store: newBucketStore(bucket),
5152
logger: logger,
5253
}

0 commit comments

Comments
 (0)