Skip to content

Commit a1e0056

Browse files
dehaansadehaansa
committed
fix usage of logger
1 parent 1038b8e commit a1e0056

File tree

11 files changed

+46
-46
lines changed

11 files changed

+46
-46
lines changed

‎cmd/postgres_exporter/datasource.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
3838
var err error
3939
dsnURI, err = url.Parse(dsn)
4040
if err != nil {
41-
logger.Error("msg", "Unable to parse DSN as URI", "dsn", loggableDSN(dsn), "err", err)
41+
logger.Error("Unable to parse DSN as URI", "dsn", loggableDSN(dsn), "err", err)
4242
continue
4343
}
4444
} else if connstringRe.MatchString(dsn) {
4545
dsnConnstring = dsn
4646
} else {
47-
logger.Error("msg", "Unable to parse DSN as either URI or connstring", "dsn", loggableDSN(dsn))
47+
logger.Error("Unable to parse DSN as either URI or connstring", "dsn", loggableDSN(dsn))
4848
continue
4949
}
5050

5151
server, err := e.servers.GetServer(dsn)
5252
if err != nil {
53-
logger.Error("msg", "Error opening connection to database", "dsn", loggableDSN(dsn), "err", err)
53+
logger.Error("Error opening connection to database", "dsn", loggableDSN(dsn), "err", err)
5454
continue
5555
}
5656
dsns[dsn] = struct{}{}
@@ -60,7 +60,7 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
6060

6161
databaseNames, err := queryDatabases(server)
6262
if err != nil {
63-
logger.Error("msg", "Error querying databases", "dsn", loggableDSN(dsn), "err", err)
63+
logger.Error("Error querying databases", "dsn", loggableDSN(dsn), "err", err)
6464
continue
6565
}
6666
for _, databaseName := range databaseNames {
@@ -108,7 +108,7 @@ func (e *Exporter) scrapeDSN(ch chan<- prometheus.Metric, dsn string) error {
108108

109109
// Check if map versions need to be updated
110110
if err := e.checkMapVersions(ch, server); err != nil {
111-
logger.Warn("msg", "Proceeding with outdated query maps, as the Postgres version could not be determined", "err", err)
111+
logger.Warn("Proceeding with outdated query maps, as the Postgres version could not be determined", "err", err)
112112
}
113113

114114
return server.Scrape(ch, e.disableSettingsMetrics)

‎cmd/postgres_exporter/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,28 @@ func main() {
8282

8383
if err := c.ReloadConfig(*configFile, logger); err != nil {
8484
// This is not fatal, but it means that auth must be provided for every dsn.
85-
logger.Warn("msg", "Error loading config", "err", err)
85+
logger.Warn("Error loading config", "err", err)
8686
}
8787

8888
dsns, err := getDataSources()
8989
if err != nil {
90-
logger.Error("msg", "Failed reading data sources", "err", err.Error())
90+
logger.Error("Failed reading data sources", "err", err.Error())
9191
os.Exit(1)
9292
}
9393

9494
excludedDatabases := strings.Split(*excludeDatabases, ",")
95-
logger.Info("msg", "Excluded databases", "databases", fmt.Sprintf("%v", excludedDatabases))
95+
logger.Info("Excluded databases", "databases", fmt.Sprintf("%v", excludedDatabases))
9696

9797
if *queriesPath != "" {
98-
logger.Warn("msg", "The extended queries.yaml config is DEPRECATED", "file", *queriesPath)
98+
logger.Warn("The extended queries.yaml config is DEPRECATED", "file", *queriesPath)
9999
}
100100

101101
if *autoDiscoverDatabases || *excludeDatabases != "" || *includeDatabases != "" {
102-
logger.Warn("msg", "Scraping additional databases via auto discovery is DEPRECATED")
102+
logger.Warn("Scraping additional databases via auto discovery is DEPRECATED")
103103
}
104104

105105
if *constantLabelsList != "" {
106-
logger.Warn("msg", "Constant labels on all metrics is DEPRECATED")
106+
logger.Warn("Constant labels on all metrics is DEPRECATED")
107107
}
108108

109109
opts := []ExporterOpt{
@@ -138,7 +138,7 @@ func main() {
138138
[]string{},
139139
)
140140
if err != nil {
141-
logger.Warn("msg", "Failed to create PostgresCollector", "err", err.Error())
141+
logger.Warn("Failed to create PostgresCollector", "err", err.Error())
142142
} else {
143143
defer pe.Close()
144144
prometheus.MustRegister(pe)
@@ -170,7 +170,7 @@ func main() {
170170

171171
srv := &http.Server{}
172172
if err := web.ListenAndServe(srv, webConfig, logger); err != nil {
173-
logger.Error("msg", "Error running HTTP server", "err", err)
173+
logger.Error("Error running HTTP server", "err", err)
174174
os.Exit(1)
175175
}
176176
}

‎cmd/postgres_exporter/namespace.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str
189189
scrapeStart := time.Now()
190190

191191
for namespace, mapping := range server.metricMap {
192-
logger.Debug("msg", "Querying namespace", "namespace", namespace)
192+
logger.Debug("Querying namespace", "namespace", namespace)
193193

194194
if mapping.master && !server.master {
195-
logger.Debug("msg", "Query skipped...")
195+
logger.Debug("Query skipped...")
196196
continue
197197
}
198198

@@ -201,7 +201,7 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str
201201
serVersion, _ := semver.Parse(server.lastMapVersion.String())
202202
runServerRange, _ := semver.ParseRange(server.runonserver)
203203
if !runServerRange(serVersion) {
204-
logger.Debug("msg", "Query skipped for this database version", "version", server.lastMapVersion.String(), "target_version", server.runonserver)
204+
logger.Debug("Query skipped for this database version", "version", server.lastMapVersion.String(), "target_version", server.runonserver)
205205
continue
206206
}
207207
}

‎cmd/postgres_exporter/pg_setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var (
3131

3232
// Query the pg_settings view containing runtime variables
3333
func querySettings(ch chan<- prometheus.Metric, server *Server) error {
34-
logger.Debug("msg", "Querying pg_setting view", "server", server)
34+
logger.Debug("Querying pg_setting view", "server", server)
3535

3636
// pg_settings docs: https://www.postgresql.org/docs/current/static/view-pg-settings.html
3737
//

‎cmd/postgres_exporter/postgres_exporter.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
283283
if !columnMapping.supportedVersions(pgVersion) {
284284
// It's very useful to be able to see what columns are being
285285
// rejected.
286-
logger.Debug("msg", "Column is being forced to discard due to version incompatibility", "column", columnName)
286+
logger.Debug("Column is being forced to discard due to version incompatibility", "column", columnName)
287287
thisMap[columnName] = MetricMap{
288288
discard: true,
289289
conversion: func(_ interface{}) (float64, bool) {
@@ -370,7 +370,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
370370
case string:
371371
durationString = t
372372
default:
373-
logger.Error("msg", "Duration conversion metric was not a string")
373+
logger.Error("Duration conversion metric was not a string")
374374
return math.NaN(), false
375375
}
376376

@@ -380,7 +380,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
380380

381381
d, err := time.ParseDuration(durationString)
382382
if err != nil {
383-
logger.Error("msg", "Failed converting result to metric", "column", columnName, "in", in, "err", err)
383+
logger.Error("Failed converting result to metric", "column", columnName, "in", in, "err", err)
384384
return math.NaN(), false
385385
}
386386
return float64(d / time.Millisecond), true
@@ -581,7 +581,7 @@ func newDesc(subsystem, name, help string, labels prometheus.Labels) *prometheus
581581
}
582582

583583
func checkPostgresVersion(db *sql.DB, server string) (semver.Version, string, error) {
584-
logger.Debug("msg", "Querying PostgreSQL version", "server", server)
584+
logger.Debug("Querying PostgreSQL version", "server", server)
585585
versionRow := db.QueryRow("SELECT version();")
586586
var versionString string
587587
err := versionRow.Scan(&versionString)
@@ -604,12 +604,12 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
604604
}
605605

606606
if !e.disableDefaultMetrics && semanticVersion.LT(lowestSupportedVersion) {
607-
logger.Warn("msg", "PostgreSQL version is lower than our lowest supported version", "server", server, "version", semanticVersion, "lowest_supported_version", lowestSupportedVersion)
607+
logger.Warn("PostgreSQL version is lower than our lowest supported version", "server", server, "version", semanticVersion, "lowest_supported_version", lowestSupportedVersion)
608608
}
609609

610610
// Check if semantic version changed and recalculate maps if needed.
611611
if semanticVersion.NE(server.lastMapVersion) || server.metricMap == nil {
612-
logger.Info("msg", "Semantic version changed", "server", server, "from", server.lastMapVersion, "to", semanticVersion)
612+
logger.Info("Semantic version changed", "server", server, "from", server.lastMapVersion, "to", semanticVersion)
613613
server.mappingMtx.Lock()
614614

615615
// Get Default Metrics only for master database
@@ -630,13 +630,13 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
630630
// Calculate the hashsum of the useQueries
631631
userQueriesData, err := os.ReadFile(e.userQueriesPath)
632632
if err != nil {
633-
logger.Error("msg", "Failed to reload user queries", "path", e.userQueriesPath, "err", err)
633+
logger.Error("Failed to reload user queries", "path", e.userQueriesPath, "err", err)
634634
e.userQueriesError.WithLabelValues(e.userQueriesPath, "").Set(1)
635635
} else {
636636
hashsumStr := fmt.Sprintf("%x", sha256.Sum256(userQueriesData))
637637

638638
if err := addQueries(userQueriesData, semanticVersion, server); err != nil {
639-
logger.Error("msg", "Failed to reload user queries", "path", e.userQueriesPath, "err", err)
639+
logger.Error("Failed to reload user queries", "path", e.userQueriesPath, "err", err)
640640
e.userQueriesError.WithLabelValues(e.userQueriesPath, hashsumStr).Set(1)
641641
} else {
642642
// Mark user queries as successfully loaded

‎cmd/postgres_exporter/probe.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
3737
var authModule config.AuthModule
3838
authModuleName := params.Get("auth_module")
3939
if authModuleName == "" {
40-
logger.Info("msg", "no auth_module specified, using default")
40+
logger.Info("no auth_module specified, using default")
4141
} else {
4242
var ok bool
4343
authModule, ok = conf.AuthModules[authModuleName]
@@ -53,7 +53,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
5353

5454
dsn, err := authModule.ConfigureTarget(target)
5555
if err != nil {
56-
logger.Error("msg", "failed to configure target", "err", err)
56+
logger.Error("failed to configure target", "err", err)
5757
http.Error(w, fmt.Sprintf("could not configure dsn for target: %v", err), http.StatusBadRequest)
5858
return
5959
}
@@ -84,7 +84,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
8484
// Run the probe
8585
pc, err := collector.NewProbeCollector(tl, excludeDatabases, registry, dsn)
8686
if err != nil {
87-
logger.Error("msg", "Error creating probe collector", "err", err)
87+
logger.Error("Error creating probe collector", "err", err)
8888
http.Error(w, err.Error(), http.StatusInternalServerError)
8989
return
9090
}

‎cmd/postgres_exporter/queries.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func makeQueryOverrideMap(pgVersion semver.Version, queryOverrides map[string][]
169169
}
170170
}
171171
if !matched {
172-
logger.Warn("msg", "No query matched override, disabling metric space", "name", name)
172+
logger.Warn("No query matched override, disabling metric space", "name", name)
173173
resultMap[name] = ""
174174
}
175175
}
@@ -190,7 +190,7 @@ func parseUserQueries(content []byte) (map[string]intermediateMetricMap, map[str
190190
newQueryOverrides := make(map[string]string)
191191

192192
for metric, specs := range userQueries {
193-
logger.Debug("msg", "New user metric namespace from YAML metric", "metric", metric, "cache_seconds", specs.CacheSeconds)
193+
logger.Debug("New user metric namespace from YAML metric", "metric", metric, "cache_seconds", specs.CacheSeconds)
194194
newQueryOverrides[metric] = specs.Query
195195
metricMap, ok := metricMaps[metric]
196196
if !ok {
@@ -242,9 +242,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error
242242
for k, v := range partialExporterMap {
243243
_, found := server.metricMap[k]
244244
if found {
245-
logger.Debug("msg", "Overriding metric from user YAML file", "metric", k)
245+
logger.Debug("Overriding metric from user YAML file", "metric", k)
246246
} else {
247-
logger.Debug("msg", "Adding new metric from user YAML file", "metric", k)
247+
logger.Debug("Adding new metric from user YAML file", "metric", k)
248248
}
249249
server.metricMap[k] = v
250250
}
@@ -253,9 +253,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error
253253
for k, v := range newQueryOverrides {
254254
_, found := server.queryOverrides[k]
255255
if found {
256-
logger.Debug("msg", "Overriding query override from user YAML file", "query_override", k)
256+
logger.Debug("Overriding query override from user YAML file", "query_override", k)
257257
} else {
258-
logger.Debug("msg", "Adding new query override from user YAML file", "query_override", k)
258+
logger.Debug("Adding new query override from user YAML file", "query_override", k)
259259
}
260260
server.queryOverrides[k] = v
261261
}

‎cmd/postgres_exporter/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewServer(dsn string, opts ...ServerOpt) (*Server, error) {
7070
db.SetMaxOpenConns(1)
7171
db.SetMaxIdleConns(1)
7272

73-
logger.Info("msg", "Established new database connection", "fingerprint", fingerprint)
73+
logger.Info("Established new database connection", "fingerprint", fingerprint)
7474

7575
s := &Server{
7676
db: db,
@@ -97,7 +97,7 @@ func (s *Server) Close() error {
9797
func (s *Server) Ping() error {
9898
if err := s.db.Ping(); err != nil {
9999
if cerr := s.Close(); cerr != nil {
100-
logger.Error("msg", "Error while closing non-pinging DB connection", "server", s, "err", cerr)
100+
logger.Error("Error while closing non-pinging DB connection", "server", s, "err", cerr)
101101
}
102102
return err
103103
}
@@ -184,7 +184,7 @@ func (s *Servers) Close() {
184184
defer s.m.Unlock()
185185
for _, server := range s.servers {
186186
if err := server.Close(); err != nil {
187-
logger.Error("msg", "Failed to close connection", "server", server, "err", err)
187+
logger.Error("Failed to close connection", "server", server, "err", err)
188188
}
189189
}
190190
}

‎cmd/postgres_exporter/util.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ func dbToFloat64(t interface{}) (float64, bool) {
8181
strV := string(v)
8282
result, err := strconv.ParseFloat(strV, 64)
8383
if err != nil {
84-
logger.Info("msg", "Could not parse []byte", "err", err)
84+
logger.Info("Could not parse []byte", "err", err)
8585
return math.NaN(), false
8686
}
8787
return result, true
8888
case string:
8989
result, err := strconv.ParseFloat(v, 64)
9090
if err != nil {
91-
logger.Info("msg", "Could not parse string", "err", err)
91+
logger.Info("Could not parse string", "err", err)
9292
return math.NaN(), false
9393
}
9494
return result, true
@@ -121,14 +121,14 @@ func dbToUint64(t interface{}) (uint64, bool) {
121121
strV := string(v)
122122
result, err := strconv.ParseUint(strV, 10, 64)
123123
if err != nil {
124-
logger.Info("msg", "Could not parse []byte", "err", err)
124+
logger.Info("Could not parse []byte", "err", err)
125125
return 0, false
126126
}
127127
return result, true
128128
case string:
129129
result, err := strconv.ParseUint(v, 10, 64)
130130
if err != nil {
131-
logger.Info("msg", "Could not parse string", "err", err)
131+
logger.Info("Could not parse string", "err", err)
132132
return 0, false
133133
}
134134
return result, true

‎collector/collector.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {
173173
err := inst.setup()
174174
defer inst.Close()
175175
if err != nil {
176-
p.logger.Error("msg", "Error opening connection to database", "err", err)
176+
p.logger.Error("Error opening connection to database", "err", err)
177177
return
178178
}
179179

@@ -200,13 +200,13 @@ func execute(ctx context.Context, name string, c Collector, instance *instance,
200200

201201
if err != nil {
202202
if IsNoDataError(err) {
203-
logger.Debug("msg", "collector returned no data", "name", name, "duration_seconds", duration.Seconds(), "err", err)
203+
logger.Debug("collector returned no data", "name", name, "duration_seconds", duration.Seconds(), "err", err)
204204
} else {
205-
logger.Error("msg", "collector failed", "name", name, "duration_seconds", duration.Seconds(), "err", err)
205+
logger.Error("collector failed", "name", name, "duration_seconds", duration.Seconds(), "err", err)
206206
}
207207
success = 0
208208
} else {
209-
logger.Debug("msg", "collector succeeded", "name", name, "duration_seconds", duration.Seconds())
209+
logger.Debug("collector succeeded", "name", name, "duration_seconds", duration.Seconds())
210210
success = 1
211211
}
212212
ch <- prometheus.MustNewConstMetric(scrapeDurationDesc, prometheus.GaugeValue, duration.Seconds(), name)

‎collector/probe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (pc *ProbeCollector) Collect(ch chan<- prometheus.Metric) {
7878
err := pc.instance.setup()
7979
defer pc.instance.Close()
8080
if err != nil {
81-
pc.logger.Error("msg", "Error opening connection to database", "err", err)
81+
pc.logger.Error("Error opening connection to database", "err", err)
8282
return
8383
}
8484

0 commit comments

Comments
 (0)