@@ -307,32 +307,35 @@ func Start(configFilePath string, receiver storage.Appendable, shutDownChan chan
307
307
)
308
308
}
309
309
310
- // Set up a separate zap logger for the certWatcher (just this part, not the entire file)
311
- zapLogger , err := zap .NewProduction () // or zap.NewDevelopment() depending on your needs
310
+ zapLogger , err := zap .NewProduction ()
312
311
if err != nil {
313
- level .Error (logger ).Log ("msg" , "Failed to create zap logger" , "err" , err )
314
- return
312
+ zapLogger = zap .NewNop ()
315
313
}
316
314
317
- // Create the certWatcher with the new zap logger
318
315
certWatcher , err := tls .NewCertWatcher (DefaultTLSCertFilePath , DefaultTLSKeyFilePath , DefaultTLSCaFilePath , zapLogger )
319
316
if err != nil {
320
317
level .Error (logger ).Log ("msg" , "Failed to initialize cert watcher" , "err" , err )
321
318
} else {
322
319
certWatcher .RegisterCallback (func () {
323
320
level .Info (logger ).Log ("msg" , "Certificate files changed, restarting target allocator manager" )
324
- // Shutdown and restart the Target Allocator manager
325
321
taManager .Shutdown ()
326
- // Reload the Target Allocator manager's configuration and start it again
327
322
taManager = createTargetAllocatorManager (configFilePath , log .With (logger , "component" , "ta manager" ), logLevel , scrapeManager , discoveryManagerScrape )
328
- // Ensure it's enabled before running
323
+ taManager .AttachReloadConfigHandler (
324
+ func (prometheusConfig * config.Config ) {
325
+ relabelScrapeConfigs (prometheusConfig , logger )
326
+ },
327
+ )
329
328
if taManager .enabled {
330
329
if err := taManager .Run (); err != nil {
331
330
level .Error (logger ).Log ("msg" , "Error restarting target allocator manager" , "err" , err )
332
331
}
333
332
}
334
333
})
335
- go certWatcher .Start (context .Background ())
334
+ go func () {
335
+ if err := certWatcher .Start (context .Background ()); err != nil {
336
+ level .Error (logger ).Log ("msg" , "Failed to start cert watcher" , "err" , err )
337
+ }
338
+ }()
336
339
}
337
340
338
341
if err := g .Run (); err != nil {
0 commit comments