From 8ee03edf085a48de94674ab13b8a1f8202b264b5 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Wed, 16 Jul 2025 17:35:20 +0200 Subject: [PATCH] Replace another custom implementation of `slices.Contains` Followup of https://github.com/prometheus-community/postgres_exporter/pull/1176 Signed-off-by: Cristian Greco --- cmd/postgres_exporter/datasource.go | 5 +++-- cmd/postgres_exporter/util.go | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cmd/postgres_exporter/datasource.go b/cmd/postgres_exporter/datasource.go index 7a22e177c..cebe5072e 100644 --- a/cmd/postgres_exporter/datasource.go +++ b/cmd/postgres_exporter/datasource.go @@ -18,6 +18,7 @@ import ( "net/url" "os" "regexp" + "slices" "strings" "github.com/prometheus/client_golang/prometheus" @@ -64,11 +65,11 @@ func (e *Exporter) discoverDatabaseDSNs() []string { continue } for _, databaseName := range databaseNames { - if contains(e.excludeDatabases, databaseName) { + if slices.Contains(e.excludeDatabases, databaseName) { continue } - if len(e.includeDatabases) != 0 && !contains(e.includeDatabases, databaseName) { + if len(e.includeDatabases) != 0 && !slices.Contains(e.includeDatabases, databaseName) { continue } diff --git a/cmd/postgres_exporter/util.go b/cmd/postgres_exporter/util.go index 8907e7c5f..fa692c652 100644 --- a/cmd/postgres_exporter/util.go +++ b/cmd/postgres_exporter/util.go @@ -24,15 +24,6 @@ import ( "github.com/lib/pq" ) -func contains(a []string, x string) bool { - for _, n := range a { - if x == n { - return true - } - } - return false -} - // convert a string to the corresponding ColumnUsage func stringToColumnUsage(s string) (ColumnUsage, error) { var u ColumnUsage