Reload on start.

Signed-off-by: Harkishen-Singh <[email protected]>

Author: Harkishen-Singh

pkg/reloader/reloader.go

@@ -67,15 +67,18 @@ func (l *loader) Add(serviceName string, update func() error) {
 	l.services = append(l.services, service{serviceName, update})
 }
 
-func (l *loader) Run() {
+func (l *loader) Run() error {
 	sighup := make(chan os.Signal, 1)
 	signal.Notify(sighup, syscall.SIGHUP)
 
+	if err := l.reload(); err != nil {
+		return fmt.Errorf("error reloading: %w", err)
+	}
 	for {
 		select {
 		case <-l.ctx.Done():
 			l.services = nil // Make services GC-able.
-			return
+			return nil
 		case <-sighup:
 			if err := l.reload(); err != nil {
 				log.Error("msg", "stopping reload", "reason", err.Error())

pkg/runner/runner.go

@@ -251,8 +251,11 @@ func Run(cfg *Config) error {
 		cfg.APICfg.Rules = manager
 
 		loader.Add("rules-manager", func() error {
-			promCfg := cfg.RulesCfg.PrometheusConfig
-			return errors.WithMessage(manager.ApplyConfig(promCfg), "error applying Prometheus configuration to rules manager")
+			err := rules.Validate(&cfg.RulesCfg) // This refreshes the cfg.RulesCfg.PrometheusConfig entry in RulesCfg.
+			if err != nil {
+				return fmt.Errorf("error validating rules-config: %w", err)
+			}
+			return errors.WithMessage(manager.ApplyConfig(cfg.RulesCfg.PrometheusConfig), "error applying Prometheus configuration to rules manager")
 		})
 
 		group.Add(
@@ -277,8 +280,7 @@ func Run(cfg *Config) error {
 
 	group.Add(
 		func() error {
-			loader.Run()
-			return nil
+			return loader.Run()
 		}, func(error) {
 			stopLoader()
 		},

pkg/tests/end_to_end_tests/promql_endpoint_integration_test.go

@@ -324,7 +324,7 @@ func buildRouterWithAPIConfig(pool *pgxpool.Pool, cfg *api.Config) (*mux.Router,
 
 	jaegerQuery := jaegerquery.New(pgClient.QuerierConnection, &jaegerquery.DefaultConfig)
 
-	router, err := api.GenerateRouter(cfg, qryCfg, pgClient, jaegerQuery)
+	router, err := api.GenerateRouter(cfg, qryCfg, pgClient, jaegerQuery, nil)
 	if err != nil {
 		return nil, nil, fmt.Errorf("generate router: %w", err)
 	}