fix usage of logger

dehaansa · dehaansa · commit a1e0056fedbf · 2025-02-13T11:35:33.000-05:00
diff --git a/cmd/postgres_exporter/datasource.go b/cmd/postgres_exporter/datasource.go
@@ -38,19 +38,19 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
 			var err error
 			dsnURI, err = url.Parse(dsn)
 			if err != nil {
-				logger.Error("msg", "Unable to parse DSN as URI", "dsn", loggableDSN(dsn), "err", err)
+				logger.Error("Unable to parse DSN as URI", "dsn", loggableDSN(dsn), "err", err)
 				continue
 			}
 		} else if connstringRe.MatchString(dsn) {
 			dsnConnstring = dsn
 		} else {
-			logger.Error("msg", "Unable to parse DSN as either URI or connstring", "dsn", loggableDSN(dsn))
+			logger.Error("Unable to parse DSN as either URI or connstring", "dsn", loggableDSN(dsn))
 			continue
 		}
 
 		server, err := e.servers.GetServer(dsn)
 		if err != nil {
-			logger.Error("msg", "Error opening connection to database", "dsn", loggableDSN(dsn), "err", err)
+			logger.Error("Error opening connection to database", "dsn", loggableDSN(dsn), "err", err)
 			continue
 		}
 		dsns[dsn] = struct{}{}
@@ -60,7 +60,7 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
 
 		databaseNames, err := queryDatabases(server)
 		if err != nil {
-			logger.Error("msg", "Error querying databases", "dsn", loggableDSN(dsn), "err", err)
+			logger.Error("Error querying databases", "dsn", loggableDSN(dsn), "err", err)
 			continue
 		}
 		for _, databaseName := range databaseNames {
@@ -108,7 +108,7 @@ func (e *Exporter) scrapeDSN(ch chan<- prometheus.Metric, dsn string) error {
 
 	// Check if map versions need to be updated
 	if err := e.checkMapVersions(ch, server); err != nil {
-		logger.Warn("msg", "Proceeding with outdated query maps, as the Postgres version could not be determined", "err", err)
+		logger.Warn("Proceeding with outdated query maps, as the Postgres version could not be determined", "err", err)
 	}
 
 	return server.Scrape(ch, e.disableSettingsMetrics)
diff --git a/cmd/postgres_exporter/main.go b/cmd/postgres_exporter/main.go
@@ -82,28 +82,28 @@ func main() {
 
 	if err := c.ReloadConfig(*configFile, logger); err != nil {
 		// This is not fatal, but it means that auth must be provided for every dsn.
-		logger.Warn("msg", "Error loading config", "err", err)
+		logger.Warn("Error loading config", "err", err)
 	}
 
 	dsns, err := getDataSources()
 	if err != nil {
-		logger.Error("msg", "Failed reading data sources", "err", err.Error())
+		logger.Error("Failed reading data sources", "err", err.Error())
 		os.Exit(1)
 	}
 
 	excludedDatabases := strings.Split(*excludeDatabases, ",")
-	logger.Info("msg", "Excluded databases", "databases", fmt.Sprintf("%v", excludedDatabases))
+	logger.Info("Excluded databases", "databases", fmt.Sprintf("%v", excludedDatabases))
 
 	if *queriesPath != "" {
-		logger.Warn("msg", "The extended queries.yaml config is DEPRECATED", "file", *queriesPath)
+		logger.Warn("The extended queries.yaml config is DEPRECATED", "file", *queriesPath)
 	}
 
 	if *autoDiscoverDatabases || *excludeDatabases != "" || *includeDatabases != "" {
-		logger.Warn("msg", "Scraping additional databases via auto discovery is DEPRECATED")
+		logger.Warn("Scraping additional databases via auto discovery is DEPRECATED")
 	}
 
 	if *constantLabelsList != "" {
-		logger.Warn("msg", "Constant labels on all metrics is DEPRECATED")
+		logger.Warn("Constant labels on all metrics is DEPRECATED")
 	}
 
 	opts := []ExporterOpt{
@@ -138,7 +138,7 @@ func main() {
 		[]string{},
 	)
 	if err != nil {
-		logger.Warn("msg", "Failed to create PostgresCollector", "err", err.Error())
+		logger.Warn("Failed to create PostgresCollector", "err", err.Error())
 	} else {
 		defer pe.Close()
 		prometheus.MustRegister(pe)
@@ -170,7 +170,7 @@ func main() {
 
 	srv := &http.Server{}
 	if err := web.ListenAndServe(srv, webConfig, logger); err != nil {
-		logger.Error("msg", "Error running HTTP server", "err", err)
+		logger.Error("Error running HTTP server", "err", err)
 		os.Exit(1)
 	}
 }
diff --git a/cmd/postgres_exporter/namespace.go b/cmd/postgres_exporter/namespace.go
@@ -189,10 +189,10 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str
 	scrapeStart := time.Now()
 
 	for namespace, mapping := range server.metricMap {
-		logger.Debug("msg", "Querying namespace", "namespace", namespace)
+		logger.Debug("Querying namespace", "namespace", namespace)
 
 		if mapping.master && !server.master {
-			logger.Debug("msg", "Query skipped...")
+			logger.Debug("Query skipped...")
 			continue
 		}
 
@@ -201,7 +201,7 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str
 			serVersion, _ := semver.Parse(server.lastMapVersion.String())
 			runServerRange, _ := semver.ParseRange(server.runonserver)
 			if !runServerRange(serVersion) {
-				logger.Debug("msg", "Query skipped for this database version", "version", server.lastMapVersion.String(), "target_version", server.runonserver)
+				logger.Debug("Query skipped for this database version", "version", server.lastMapVersion.String(), "target_version", server.runonserver)
 				continue
 			}
 		}
diff --git a/cmd/postgres_exporter/pg_setting.go b/cmd/postgres_exporter/pg_setting.go
@@ -31,7 +31,7 @@ var (
 
 // Query the pg_settings view containing runtime variables
 func querySettings(ch chan<- prometheus.Metric, server *Server) error {
-	logger.Debug("msg", "Querying pg_setting view", "server", server)
+	logger.Debug("Querying pg_setting view", "server", server)
 
 	// pg_settings docs: https://www.postgresql.org/docs/current/static/view-pg-settings.html
 	//
diff --git a/cmd/postgres_exporter/postgres_exporter.go b/cmd/postgres_exporter/postgres_exporter.go
@@ -283,7 +283,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
 				if !columnMapping.supportedVersions(pgVersion) {
 					// It's very useful to be able to see what columns are being
 					// rejected.
-					logger.Debug("msg", "Column is being forced to discard due to version incompatibility", "column", columnName)
+					logger.Debug("Column is being forced to discard due to version incompatibility", "column", columnName)
 					thisMap[columnName] = MetricMap{
 						discard: true,
 						conversion: func(_ interface{}) (float64, bool) {
@@ -370,7 +370,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
 						case string:
 							durationString = t
 						default:
-							logger.Error("msg", "Duration conversion metric was not a string")
+							logger.Error("Duration conversion metric was not a string")
 							return math.NaN(), false
 						}
 
@@ -380,7 +380,7 @@ func makeDescMap(pgVersion semver.Version, serverLabels prometheus.Labels, metri
 
 						d, err := time.ParseDuration(durationString)
 						if err != nil {
-							logger.Error("msg", "Failed converting result to metric", "column", columnName, "in", in, "err", err)
+							logger.Error("Failed converting result to metric", "column", columnName, "in", in, "err", err)
 							return math.NaN(), false
 						}
 						return float64(d / time.Millisecond), true
@@ -581,7 +581,7 @@ func newDesc(subsystem, name, help string, labels prometheus.Labels) *prometheus
 }
 
 func checkPostgresVersion(db *sql.DB, server string) (semver.Version, string, error) {
-	logger.Debug("msg", "Querying PostgreSQL version", "server", server)
+	logger.Debug("Querying PostgreSQL version", "server", server)
 	versionRow := db.QueryRow("SELECT version();")
 	var versionString string
 	err := versionRow.Scan(&versionString)
@@ -604,12 +604,12 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
 	}
 
 	if !e.disableDefaultMetrics && semanticVersion.LT(lowestSupportedVersion) {
-		logger.Warn("msg", "PostgreSQL version is lower than our lowest supported version", "server", server, "version", semanticVersion, "lowest_supported_version", lowestSupportedVersion)
+		logger.Warn("PostgreSQL version is lower than our lowest supported version", "server", server, "version", semanticVersion, "lowest_supported_version", lowestSupportedVersion)
 	}
 
 	// Check if semantic version changed and recalculate maps if needed.
 	if semanticVersion.NE(server.lastMapVersion) || server.metricMap == nil {
-		logger.Info("msg", "Semantic version changed", "server", server, "from", server.lastMapVersion, "to", semanticVersion)
+		logger.Info("Semantic version changed", "server", server, "from", server.lastMapVersion, "to", semanticVersion)
 		server.mappingMtx.Lock()
 
 		// Get Default Metrics only for master database
@@ -630,13 +630,13 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
 			// Calculate the hashsum of the useQueries
 			userQueriesData, err := os.ReadFile(e.userQueriesPath)
 			if err != nil {
-				logger.Error("msg", "Failed to reload user queries", "path", e.userQueriesPath, "err", err)
+				logger.Error("Failed to reload user queries", "path", e.userQueriesPath, "err", err)
 				e.userQueriesError.WithLabelValues(e.userQueriesPath, "").Set(1)
 			} else {
 				hashsumStr := fmt.Sprintf("%x", sha256.Sum256(userQueriesData))
 
 				if err := addQueries(userQueriesData, semanticVersion, server); err != nil {
-					logger.Error("msg", "Failed to reload user queries", "path", e.userQueriesPath, "err", err)
+					logger.Error("Failed to reload user queries", "path", e.userQueriesPath, "err", err)
 					e.userQueriesError.WithLabelValues(e.userQueriesPath, hashsumStr).Set(1)
 				} else {
 					// Mark user queries as successfully loaded
diff --git a/cmd/postgres_exporter/probe.go b/cmd/postgres_exporter/probe.go
@@ -37,7 +37,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
 		var authModule config.AuthModule
 		authModuleName := params.Get("auth_module")
 		if authModuleName == "" {
-			logger.Info("msg", "no auth_module specified, using default")
+			logger.Info("no auth_module specified, using default")
 		} else {
 			var ok bool
 			authModule, ok = conf.AuthModules[authModuleName]
@@ -53,7 +53,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
 
 		dsn, err := authModule.ConfigureTarget(target)
 		if err != nil {
-			logger.Error("msg", "failed to configure target", "err", err)
+			logger.Error("failed to configure target", "err", err)
 			http.Error(w, fmt.Sprintf("could not configure dsn for target: %v", err), http.StatusBadRequest)
 			return
 		}
@@ -84,7 +84,7 @@ func handleProbe(logger *slog.Logger, excludeDatabases []string) http.HandlerFun
 		// Run the probe
 		pc, err := collector.NewProbeCollector(tl, excludeDatabases, registry, dsn)
 		if err != nil {
-			logger.Error("msg", "Error creating probe collector", "err", err)
+			logger.Error("Error creating probe collector", "err", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
diff --git a/cmd/postgres_exporter/queries.go b/cmd/postgres_exporter/queries.go
@@ -169,7 +169,7 @@ func makeQueryOverrideMap(pgVersion semver.Version, queryOverrides map[string][]
 			}
 		}
 		if !matched {
-			logger.Warn("msg", "No query matched override, disabling metric space", "name", name)
+			logger.Warn("No query matched override, disabling metric space", "name", name)
 			resultMap[name] = ""
 		}
 	}
@@ -190,7 +190,7 @@ func parseUserQueries(content []byte) (map[string]intermediateMetricMap, map[str
 	newQueryOverrides := make(map[string]string)
 
 	for metric, specs := range userQueries {
-		logger.Debug("msg", "New user metric namespace from YAML metric", "metric", metric, "cache_seconds", specs.CacheSeconds)
+		logger.Debug("New user metric namespace from YAML metric", "metric", metric, "cache_seconds", specs.CacheSeconds)
 		newQueryOverrides[metric] = specs.Query
 		metricMap, ok := metricMaps[metric]
 		if !ok {
@@ -242,9 +242,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error
 	for k, v := range partialExporterMap {
 		_, found := server.metricMap[k]
 		if found {
-			logger.Debug("msg", "Overriding metric from user YAML file", "metric", k)
+			logger.Debug("Overriding metric from user YAML file", "metric", k)
 		} else {
-			logger.Debug("msg", "Adding new metric from user YAML file", "metric", k)
+			logger.Debug("Adding new metric from user YAML file", "metric", k)
 		}
 		server.metricMap[k] = v
 	}
@@ -253,9 +253,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error
 	for k, v := range newQueryOverrides {
 		_, found := server.queryOverrides[k]
 		if found {
-			logger.Debug("msg", "Overriding query override from user YAML file", "query_override", k)
+			logger.Debug("Overriding query override from user YAML file", "query_override", k)
 		} else {
-			logger.Debug("msg", "Adding new query override from user YAML file", "query_override", k)
+			logger.Debug("Adding new query override from user YAML file", "query_override", k)
 		}
 		server.queryOverrides[k] = v
 	}
diff --git a/cmd/postgres_exporter/server.go b/cmd/postgres_exporter/server.go
@@ -70,7 +70,7 @@ func NewServer(dsn string, opts ...ServerOpt) (*Server, error) {
 	db.SetMaxOpenConns(1)
 	db.SetMaxIdleConns(1)
 
-	logger.Info("msg", "Established new database connection", "fingerprint", fingerprint)
+	logger.Info("Established new database connection", "fingerprint", fingerprint)
 
 	s := &Server{
 		db:     db,
@@ -97,7 +97,7 @@ func (s *Server) Close() error {
 func (s *Server) Ping() error {
 	if err := s.db.Ping(); err != nil {
 		if cerr := s.Close(); cerr != nil {
-			logger.Error("msg", "Error while closing non-pinging DB connection", "server", s, "err", cerr)
+			logger.Error("Error while closing non-pinging DB connection", "server", s, "err", cerr)
 		}
 		return err
 	}
@@ -184,7 +184,7 @@ func (s *Servers) Close() {
 	defer s.m.Unlock()
 	for _, server := range s.servers {
 		if err := server.Close(); err != nil {
-			logger.Error("msg", "Failed to close connection", "server", server, "err", err)
+			logger.Error("Failed to close connection", "server", server, "err", err)
 		}
 	}
 }
diff --git a/cmd/postgres_exporter/util.go b/cmd/postgres_exporter/util.go
@@ -81,14 +81,14 @@ func dbToFloat64(t interface{}) (float64, bool) {
 		strV := string(v)
 		result, err := strconv.ParseFloat(strV, 64)
 		if err != nil {
-			logger.Info("msg", "Could not parse []byte", "err", err)
+			logger.Info("Could not parse []byte", "err", err)
 			return math.NaN(), false
 		}
 		return result, true
 	case string:
 		result, err := strconv.ParseFloat(v, 64)
 		if err != nil {
-			logger.Info("msg", "Could not parse string", "err", err)
+			logger.Info("Could not parse string", "err", err)
 			return math.NaN(), false
 		}
 		return result, true
@@ -121,14 +121,14 @@ func dbToUint64(t interface{}) (uint64, bool) {
 		strV := string(v)
 		result, err := strconv.ParseUint(strV, 10, 64)
 		if err != nil {
-			logger.Info("msg", "Could not parse []byte", "err", err)
+			logger.Info("Could not parse []byte", "err", err)
 			return 0, false
 		}
 		return result, true
 	case string:
 		result, err := strconv.ParseUint(v, 10, 64)
 		if err != nil {
-			logger.Info("msg", "Could not parse string", "err", err)
+			logger.Info("Could not parse string", "err", err)
 			return 0, false
 		}
 		return result, true
diff --git a/collector/collector.go b/collector/collector.go
@@ -173,7 +173,7 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {
 	err := inst.setup()
 	defer inst.Close()
 	if err != nil {
-		p.logger.Error("msg", "Error opening connection to database", "err", err)
+		p.logger.Error("Error opening connection to database", "err", err)
 		return
 	}
 
@@ -200,13 +200,13 @@ func execute(ctx context.Context, name string, c Collector, instance *instance,
 
 	if err != nil {
 		if IsNoDataError(err) {
-			logger.Debug("msg", "collector returned no data", "name", name, "duration_seconds", duration.Seconds(), "err", err)
+			logger.Debug("collector returned no data", "name", name, "duration_seconds", duration.Seconds(), "err", err)
 		} else {
-			logger.Error("msg", "collector failed", "name", name, "duration_seconds", duration.Seconds(), "err", err)
+			logger.Error("collector failed", "name", name, "duration_seconds", duration.Seconds(), "err", err)
 		}
 		success = 0
 	} else {
-		logger.Debug("msg", "collector succeeded", "name", name, "duration_seconds", duration.Seconds())
+		logger.Debug("collector succeeded", "name", name, "duration_seconds", duration.Seconds())
 		success = 1
 	}
 	ch <- prometheus.MustNewConstMetric(scrapeDurationDesc, prometheus.GaugeValue, duration.Seconds(), name)
diff --git a/collector/probe.go b/collector/probe.go
@@ -78,7 +78,7 @@ func (pc *ProbeCollector) Collect(ch chan<- prometheus.Metric) {
 	err := pc.instance.setup()
 	defer pc.instance.Close()
 	if err != nil {
-		pc.logger.Error("msg", "Error opening connection to database", "err", err)
+		pc.logger.Error("Error opening connection to database", "err", err)
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -82,28 +82,28 @@ func main() {`
`82`	`82`
`83`	`83`	`if err := c.ReloadConfig(*configFile, logger); err != nil {`
`84`	`84`	`// 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)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`dsns, err := getDataSources()`
`89`	`89`	`if err != nil {`
`90`		`- logger.Error("msg", "Failed reading data sources", "err", err.Error())`
	`90`	`+ logger.Error("Failed reading data sources", "err", err.Error())`
`91`	`91`	`os.Exit(1)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`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))`
`96`	`96`
`97`	`97`	`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)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`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")`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if *constantLabelsList != "" {`
`106`		`- logger.Warn("msg", "Constant labels on all metrics is DEPRECATED")`
	`106`	`+ logger.Warn("Constant labels on all metrics is DEPRECATED")`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`opts := []ExporterOpt{`
`@@ -138,7 +138,7 @@ func main() {`
`138`	`138`	`[]string{},`
`139`	`139`	`)`
`140`	`140`	`if err != nil {`
`141`		`- logger.Warn("msg", "Failed to create PostgresCollector", "err", err.Error())`
	`141`	`+ logger.Warn("Failed to create PostgresCollector", "err", err.Error())`
`142`	`142`	`} else {`
`143`	`143`	`defer pe.Close()`
`144`	`144`	`prometheus.MustRegister(pe)`
`@@ -170,7 +170,7 @@ func main() {`
`170`	`170`
`171`	`171`	`srv := &http.Server{}`
`172`	`172`	`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)`
`174`	`174`	`os.Exit(1)`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,10 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str`
`189`	`189`	`scrapeStart := time.Now()`
`190`	`190`
`191`	`191`	`for namespace, mapping := range server.metricMap {`
`192`		`- logger.Debug("msg", "Querying namespace", "namespace", namespace)`
	`192`	`+ logger.Debug("Querying namespace", "namespace", namespace)`
`193`	`193`
`194`	`194`	`if mapping.master && !server.master {`
`195`		`- logger.Debug("msg", "Query skipped...")`
	`195`	`+ logger.Debug("Query skipped...")`
`196`	`196`	`continue`
`197`	`197`	`}`
`198`	`198`
`@@ -201,7 +201,7 @@ func queryNamespaceMappings(ch chan<- prometheus.Metric, server *Server) map[str`
`201`	`201`	`serVersion, _ := semver.Parse(server.lastMapVersion.String())`
`202`	`202`	`runServerRange, _ := semver.ParseRange(server.runonserver)`
`203`	`203`	`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)`
`205`	`205`	`continue`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func makeQueryOverrideMap(pgVersion semver.Version, queryOverrides map[string][]`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`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)`
`173`	`173`	`resultMap[name] = ""`
`174`	`174`	`}`
`175`	`175`	`}`
`@@ -190,7 +190,7 @@ func parseUserQueries(content []byte) (map[string]intermediateMetricMap, map[str`
`190`	`190`	`newQueryOverrides := make(map[string]string)`
`191`	`191`
`192`	`192`	`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)`
`194`	`194`	`newQueryOverrides[metric] = specs.Query`
`195`	`195`	`metricMap, ok := metricMaps[metric]`
`196`	`196`	`if !ok {`
`@@ -242,9 +242,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error`
`242`	`242`	`for k, v := range partialExporterMap {`
`243`	`243`	`_, found := server.metricMap[k]`
`244`	`244`	`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)`
`246`	`246`	`} 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)`
`248`	`248`	`}`
`249`	`249`	`server.metricMap[k] = v`
`250`	`250`	`}`
`@@ -253,9 +253,9 @@ func addQueries(content []byte, pgVersion semver.Version, server *Server) error`
`253`	`253`	`for k, v := range newQueryOverrides {`
`254`	`254`	`_, found := server.queryOverrides[k]`
`255`	`255`	`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)`
`257`	`257`	`} 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)`
`259`	`259`	`}`
`260`	`260`	`server.queryOverrides[k] = v`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func NewServer(dsn string, opts ...ServerOpt) (*Server, error) {`
`70`	`70`	`db.SetMaxOpenConns(1)`
`71`	`71`	`db.SetMaxIdleConns(1)`
`72`	`72`
`73`		`- logger.Info("msg", "Established new database connection", "fingerprint", fingerprint)`
	`73`	`+ logger.Info("Established new database connection", "fingerprint", fingerprint)`
`74`	`74`
`75`	`75`	`s := &Server{`
`76`	`76`	`db: db,`
`@@ -97,7 +97,7 @@ func (s *Server) Close() error {`
`97`	`97`	`func (s *Server) Ping() error {`
`98`	`98`	`if err := s.db.Ping(); err != nil {`
`99`	`99`	`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)`
`101`	`101`	`}`
`102`	`102`	`return err`
`103`	`103`	`}`
`@@ -184,7 +184,7 @@ func (s *Servers) Close() {`
`184`	`184`	`defer s.m.Unlock()`
`185`	`185`	`for _, server := range s.servers {`
`186`	`186`	`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)`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`