From a505c397ab286eaaf4ed178775bd0b055ca41fe0 Mon Sep 17 00:00:00 2001
From: "Alexander J. Maidak" <amaidak@equinix.com>
Date: Wed, 16 Oct 2024 17:39:03 -0500
Subject: [PATCH] Cleanup unused code from NewPostgresCollector

Signed-off-by: Alexander J. Maidak <amaidak@equinix.com>
---
 cmd/postgres_exporter/main.go |  7 +------
 collector/collector.go        | 23 ++---------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/cmd/postgres_exporter/main.go b/cmd/postgres_exporter/main.go
index f4d454996..a5d573215 100644
--- a/cmd/postgres_exporter/main.go
+++ b/cmd/postgres_exporter/main.go
@@ -132,12 +132,7 @@ func main() {
 		dsn = dsns[0]
 	}
 
-	pe, err := collector.NewPostgresCollector(
-		logger,
-		excludedDatabases,
-		dsn,
-		[]string{},
-	)
+	pe, err := collector.NewPostgresCollector(logger, excludedDatabases, dsn)
 	if err != nil {
 		level.Warn(logger).Log("msg", "Failed to create PostgresCollector", "err", err.Error())
 	} else {
diff --git a/collector/collector.go b/collector/collector.go
index 121129871..7cf7e1a3c 100644
--- a/collector/collector.go
+++ b/collector/collector.go
@@ -97,34 +97,15 @@ type PostgresCollector struct {
 type Option func(*PostgresCollector) error
 
 // NewPostgresCollector creates a new PostgresCollector.
-func NewPostgresCollector(logger log.Logger, excludeDatabases []string, dsn string, filters []string, options ...Option) (*PostgresCollector, error) {
+func NewPostgresCollector(logger log.Logger, excludeDatabases []string, dsn string) (*PostgresCollector, error) {
 	p := &PostgresCollector{
 		logger: logger,
 	}
-	// Apply options to customize the collector
-	for _, o := range options {
-		err := o(p)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	f := make(map[string]bool)
-	for _, filter := range filters {
-		enabled, exist := collectorState[filter]
-		if !exist {
-			return nil, fmt.Errorf("missing collector: %s", filter)
-		}
-		if !*enabled {
-			return nil, fmt.Errorf("disabled collector: %s", filter)
-		}
-		f[filter] = true
-	}
 	collectors := make(map[string]Collector)
 	initiatedCollectorsMtx.Lock()
 	defer initiatedCollectorsMtx.Unlock()
 	for key, enabled := range collectorState {
-		if !*enabled || (len(f) > 0 && !f[key]) {
+		if !*enabled {
 			continue
 		}
 		if collector, ok := initiatedCollectors[key]; ok {