Skip to content

Commit 878d057

Browse files
committed
🗑️ service: obsolete global stats config
Simplify things by turning on stats when API is enabled.
1 parent 9519851 commit 878d057

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

service/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ type ServerConfig struct {
321321
}
322322

323323
// Initialize initializes the server configuration.
324-
func (sc *ServerConfig) Initialize(tlsCertStore *tlscerts.Store, listenConfigCache conn.ListenConfigCache, collector stats.Collector, router *router.Router, logger *zap.Logger, index int) error {
324+
func (sc *ServerConfig) Initialize(tlsCertStore *tlscerts.Store, listenConfigCache conn.ListenConfigCache, statsConfig stats.Config, router *router.Router, logger *zap.Logger, index int) error {
325325
sc.tcpEnabled = sc.EnableTCP || len(sc.TCPListeners) > 0
326326
sc.udpEnabled = sc.EnableUDP || len(sc.UDPListeners) > 0
327327

@@ -388,7 +388,7 @@ func (sc *ServerConfig) Initialize(tlsCertStore *tlscerts.Store, listenConfigCac
388388

389389
sc.tlsCertStore = tlsCertStore
390390
sc.listenConfigCache = listenConfigCache
391-
sc.collector = collector
391+
sc.collector = statsConfig.Collector()
392392
sc.router = router
393393
sc.logger = logger
394394
sc.index = index

service/service.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,16 @@ func (sc *Config) Manager(logger *zap.Logger) (*Manager, error) {
158158
}
159159

160160
credman := cred.NewManager(logger)
161-
var apiSM *ssm.ServerManager
162-
163161
services = append(services, credman)
164162

163+
var (
164+
apiSM *ssm.ServerManager
165+
statsConfig stats.Config
166+
)
167+
165168
if sc.API.Enabled {
169+
statsConfig.Enabled = true
170+
166171
var apiServer *api.Server
167172
apiServer, apiSM, err = sc.API.NewServer(logger, listenConfigCache, tlsCertStore)
168173
if err != nil {
@@ -173,8 +178,8 @@ func (sc *Config) Manager(logger *zap.Logger) (*Manager, error) {
173178

174179
for i := range sc.Servers {
175180
serverConfig := &sc.Servers[i]
176-
collector := sc.Stats.Collector()
177-
if err := serverConfig.Initialize(tlsCertStore, listenConfigCache, collector, router, logger, i); err != nil {
181+
182+
if err := serverConfig.Initialize(tlsCertStore, listenConfigCache, statsConfig, router, logger, i); err != nil {
178183
return nil, fmt.Errorf("failed to initialize server %q: %w", serverConfig.Name, err)
179184
}
180185

0 commit comments

Comments
 (0)