Skip to content

Commit 3c7a06d

Browse files
committed
Remove the enable/disable for metrics, no point in not doing it always and all castware does this pattern.
1 parent 16334dc commit 3c7a06d

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

cmd/controller/run.go

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -181,22 +181,20 @@ func runController(
181181
}
182182
}()
183183

184-
// Start http server for metrics if needed
185-
if cfg.Metrics.Enabled {
186-
go func() {
187-
addr := fmt.Sprintf(":%d", cfg.Metrics.Port)
188-
log.Infof("starting metrics on %s", addr)
189-
190-
metrics.RegisterCustomMetrics()
191-
metricsMux := metrics.NewMetricsMux()
192-
// https://deepsource.com/directory/go/issues/GO-S2114
193-
// => This is not a public API and runs in customer cluster; risk should be OK.
194-
//nolint:gosec
195-
if err := http.ListenAndServe(addr, metricsMux); err != nil {
196-
log.Errorf("failed to start metrics http server: %v", err)
197-
}
198-
}()
199-
}
184+
// Start http server for metrics
185+
go func() {
186+
addr := fmt.Sprintf(":%d", cfg.Metrics.Port)
187+
log.Infof("starting metrics on %s", addr)
188+
189+
metrics.RegisterCustomMetrics()
190+
metricsMux := metrics.NewMetricsMux()
191+
// https://deepsource.com/directory/go/issues/GO-S2114
192+
// => This is not a public API and runs in customer cluster; risk should be OK.
193+
//nolint:gosec
194+
if err := http.ListenAndServe(addr, metricsMux); err != nil {
195+
log.Errorf("failed to start metrics http server: %v", err)
196+
}
197+
}()
200198

201199
if err := saveMetadata(cfg.ClusterID, cfg, log); err != nil {
202200
return err

internal/config/config.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ type TLS struct {
5454
}
5555

5656
type Metrics struct {
57-
Enabled bool
58-
Port int
57+
Port int
5958
}
6059

6160
type LeaderElection struct {
@@ -154,10 +153,8 @@ func Get() Config {
154153
cfg.MaxActionsInProgress = 1000
155154
}
156155

157-
if cfg.Metrics.Enabled {
158-
if cfg.Metrics.Port == 0 {
159-
cfg.Metrics.Port = 9090
160-
}
156+
if cfg.Metrics.Port == 0 {
157+
cfg.Metrics.Port = 9090
161158
}
162159

163160
return *cfg

0 commit comments

Comments
 (0)