Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 8843a58

Browse files
Improve logging of active servers on start.
Signed-off-by: Harkishen-Singh <[email protected]>
1 parent 1cd4dcc commit 8843a58

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

pkg/runner/runner.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"fmt"
1313
"net"
1414
"net/http"
15+
"sync"
1516
"time"
1617

1718
_ "github.com/jackc/pgx/v4/stdlib"
@@ -119,15 +120,15 @@ func Run(cfg *Config) error {
119120
return fmt.Errorf("generate router: %w", err)
120121
}
121122

122-
log.Info("msg", "Starting up...")
123-
log.Info("msg", "Listening", "addr", cfg.ListenAddr)
124-
125123
err = api.RegisterMetricsForTelemetry(client.TelemetryEngine)
126124
if err != nil {
127125
log.Error("msg", "error registering metrics for telemetry", "err", err.Error())
128126
return fmt.Errorf("error registering metrics for telemetry: %w", err)
129127
}
130128

129+
log.Info("msg", "Started Prometheus HTTP server", "listening-port", cfg.ListenAddr)
130+
131+
var wg sync.WaitGroup
131132
if len(cfg.ThanosStoreAPIListenAddr) > 0 {
132133
srv := thanos.NewStorage(client.Queryable())
133134
options := make([]grpc.ServerOption, 0)
@@ -142,15 +143,17 @@ func Run(cfg *Config) error {
142143
grpcServer := grpc.NewServer(options...)
143144
storepb.RegisterStoreServer(grpcServer, srv)
144145

146+
wg.Add(1)
145147
go func() {
146-
log.Info("msg", fmt.Sprintf("Start listening for Thanos StoreAPI on %s", cfg.ThanosStoreAPIListenAddr))
147148
listener, err := net.Listen("tcp", cfg.ThanosStoreAPIListenAddr)
148149
if err != nil {
150+
wg.Done()
149151
log.Error("msg", "Listening for Thanos StoreAPI failed", "err", err)
150152
return
151153
}
152154

153-
log.Info("msg", "Start thanos-store")
155+
log.Info("msg", "Started Thanos StoreAPI GRPC endpoint", "listening-port", cfg.ThanosStoreAPIListenAddr)
156+
wg.Done()
154157
if err := grpcServer.Serve(listener); err != nil {
155158
log.Error("msg", "Starting the Thanos store failed", "err", err)
156159
return
@@ -192,15 +195,17 @@ func Run(cfg *Config) error {
192195
return err
193196
}
194197

198+
wg.Add(1)
195199
go func() {
196-
log.Info("msg", fmt.Sprintf("Start listening for OTLP GRPC server on %s", cfg.OTLPGRPCListenAddr))
197200
listener, err := net.Listen("tcp", cfg.OTLPGRPCListenAddr)
198201
if err != nil {
202+
wg.Done()
199203
log.Error("msg", "Listening for OTLP GRPC server failed", "err", err)
200204
return
201205
}
202206

203-
log.Info("msg", "Start OTLP GRPC server")
207+
log.Info("msg", "Started OpenTelemetry OTLP GRPC server", "listening-port", cfg.OTLPGRPCListenAddr)
208+
wg.Done()
204209
if err := grpcServer.Serve(listener); err != nil {
205210
log.Error("msg", "Starting the OTLP GRPC server failed", "err", err)
206211
return
@@ -211,6 +216,9 @@ func Run(cfg *Config) error {
211216
mux := http.NewServeMux()
212217
mux.Handle("/", router)
213218

219+
wg.Wait()
220+
log.Info("msg", "All components are ready!")
221+
214222
if cfg.TLSCertFile != "" {
215223
err = http.ListenAndServeTLS(cfg.ListenAddr, cfg.TLSCertFile, cfg.TLSKeyFile, mux)
216224
} else {

0 commit comments

Comments
 (0)