Skip to content

Commit 87aa3a3

Browse files
fix: pass initialized logger to prom metric exporter
The prometheus metric exporter in the agent always got a `nil` logger. It only logs in a very particular case, which would cause a nil panic. This issue has been fixed, by initializing the logger before.
1 parent a9817b2 commit 87aa3a3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cmd/agent/daemon/app/app.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ func (a *App) Run(ctx context.Context) error {
119119
MinLevel: logging.MustParseLevel(cfg.SendLogsLevel),
120120
})
121121
logHandlers = append(logHandlers, logsExportHandler)
122+
log = logging.New(logHandlers...)
122123

123124
if cfg.PromMetricsExportEnabled {
124125
castaiMetricsExporter := castai.NewPromMetricsExporter(log, batchLogsApiClient, prometheus.DefaultGatherer, castai.PromMetricsExporterConfig{
@@ -129,10 +130,11 @@ func (a *App) Run(ctx context.Context) error {
129130
return castaiMetricsExporter.Run(ctx)
130131
})
131132
}
133+
} else {
134+
log = logging.New(logHandlers...)
132135
}
133-
log = logging.New(logHandlers...)
134-
exporters = append(exporters, castaiexport.NewDataBatchWriter(castaiClient, log))
135136

137+
exporters = append(exporters, castaiexport.NewDataBatchWriter(castaiClient, log))
136138
} else {
137139
log = logging.New(logHandlers...)
138140
log.Warn("castai config is not set or it is invalid, running agent in standalone mode")

0 commit comments

Comments
 (0)