diff --git a/collector/collector.go b/collector/collector.go index de7203486..314fbc270 100644 --- a/collector/collector.go +++ b/collector/collector.go @@ -27,7 +27,7 @@ import ( ) var ( - factories = make(map[string]func(collectorConfig) (Collector, error)) + factories = make(map[string]func(CollectorConfig) (Collector, error)) initiatedCollectorsMtx = sync.Mutex{} initiatedCollectors = make(map[string]Collector) collectorState = make(map[string]*bool) @@ -62,12 +62,12 @@ type Collector interface { Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error } -type collectorConfig struct { - logger *slog.Logger - excludeDatabases []string +type CollectorConfig struct { + Logger *slog.Logger + ExcludeDatabases []string } -func registerCollector(name string, isDefaultEnabled bool, createFunc func(collectorConfig) (Collector, error)) { +func registerCollector(name string, isDefaultEnabled bool, createFunc func(CollectorConfig) (Collector, error)) { var helpDefaultState string if isDefaultEnabled { helpDefaultState = "enabled" @@ -131,9 +131,9 @@ func NewPostgresCollector(logger *slog.Logger, excludeDatabases []string, dsn st if collector, ok := initiatedCollectors[key]; ok { collectors[key] = collector } else { - collector, err := factories[key](collectorConfig{ - logger: logger.With("collector", key), - excludeDatabases: excludeDatabases, + collector, err := factories[key](CollectorConfig{ + Logger: logger.With("collector", key), + ExcludeDatabases: excludeDatabases, }) if err != nil { return nil, err diff --git a/collector/pg_buffercache_summary.go b/collector/pg_buffercache_summary.go index 8b0e0f007..1b228e882 100644 --- a/collector/pg_buffercache_summary.go +++ b/collector/pg_buffercache_summary.go @@ -39,9 +39,9 @@ type BuffercacheSummaryCollector struct { log *slog.Logger } -func NewBuffercacheSummaryCollector(config collectorConfig) (Collector, error) { +func NewBuffercacheSummaryCollector(config CollectorConfig) (Collector, error) { return &BuffercacheSummaryCollector{ - log: config.logger, + log: config.Logger, }, nil } diff --git a/collector/pg_database.go b/collector/pg_database.go index 7f98748f4..9bb2a294d 100644 --- a/collector/pg_database.go +++ b/collector/pg_database.go @@ -33,13 +33,13 @@ type PGDatabaseCollector struct { excludedDatabases []string } -func NewPGDatabaseCollector(config collectorConfig) (Collector, error) { - exclude := config.excludeDatabases +func NewPGDatabaseCollector(config CollectorConfig) (Collector, error) { + exclude := config.ExcludeDatabases if exclude == nil { exclude = []string{} } return &PGDatabaseCollector{ - log: config.logger, + log: config.Logger, excludedDatabases: exclude, }, nil } diff --git a/collector/pg_database_wraparound.go b/collector/pg_database_wraparound.go index d170821b5..42196b4c1 100644 --- a/collector/pg_database_wraparound.go +++ b/collector/pg_database_wraparound.go @@ -31,8 +31,8 @@ type PGDatabaseWraparoundCollector struct { log *slog.Logger } -func NewPGDatabaseWraparoundCollector(config collectorConfig) (Collector, error) { - return &PGDatabaseWraparoundCollector{log: config.logger}, nil +func NewPGDatabaseWraparoundCollector(config CollectorConfig) (Collector, error) { + return &PGDatabaseWraparoundCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_locks.go b/collector/pg_locks.go index add3e6d42..87c975403 100644 --- a/collector/pg_locks.go +++ b/collector/pg_locks.go @@ -31,9 +31,9 @@ type PGLocksCollector struct { log *slog.Logger } -func NewPGLocksCollector(config collectorConfig) (Collector, error) { +func NewPGLocksCollector(config CollectorConfig) (Collector, error) { return &PGLocksCollector{ - log: config.logger, + log: config.Logger, }, nil } diff --git a/collector/pg_long_running_transactions.go b/collector/pg_long_running_transactions.go index d7d1e6d30..0768d00e5 100644 --- a/collector/pg_long_running_transactions.go +++ b/collector/pg_long_running_transactions.go @@ -30,8 +30,8 @@ type PGLongRunningTransactionsCollector struct { log *slog.Logger } -func NewPGLongRunningTransactionsCollector(config collectorConfig) (Collector, error) { - return &PGLongRunningTransactionsCollector{log: config.logger}, nil +func NewPGLongRunningTransactionsCollector(config CollectorConfig) (Collector, error) { + return &PGLongRunningTransactionsCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_postmaster.go b/collector/pg_postmaster.go index b81e4f905..45a93c557 100644 --- a/collector/pg_postmaster.go +++ b/collector/pg_postmaster.go @@ -29,7 +29,7 @@ func init() { type PGPostmasterCollector struct { } -func NewPGPostmasterCollector(collectorConfig) (Collector, error) { +func NewPGPostmasterCollector(CollectorConfig) (Collector, error) { return &PGPostmasterCollector{}, nil } diff --git a/collector/pg_process_idle.go b/collector/pg_process_idle.go index 7f3ff6f0f..ac034cce3 100644 --- a/collector/pg_process_idle.go +++ b/collector/pg_process_idle.go @@ -33,8 +33,8 @@ type PGProcessIdleCollector struct { const processIdleSubsystem = "process_idle" -func NewPGProcessIdleCollector(config collectorConfig) (Collector, error) { - return &PGProcessIdleCollector{log: config.logger}, nil +func NewPGProcessIdleCollector(config CollectorConfig) (Collector, error) { + return &PGProcessIdleCollector{log: config.Logger}, nil } var pgProcessIdleSeconds = prometheus.NewDesc( diff --git a/collector/pg_replication.go b/collector/pg_replication.go index 7f8b2fbd7..11f5085bc 100644 --- a/collector/pg_replication.go +++ b/collector/pg_replication.go @@ -28,7 +28,7 @@ func init() { type PGReplicationCollector struct { } -func NewPGReplicationCollector(collectorConfig) (Collector, error) { +func NewPGReplicationCollector(CollectorConfig) (Collector, error) { return &PGReplicationCollector{}, nil } diff --git a/collector/pg_replication_slot.go b/collector/pg_replication_slot.go index e6c9773eb..7a86d30e7 100644 --- a/collector/pg_replication_slot.go +++ b/collector/pg_replication_slot.go @@ -32,8 +32,8 @@ type PGReplicationSlotCollector struct { log *slog.Logger } -func NewPGReplicationSlotCollector(config collectorConfig) (Collector, error) { - return &PGReplicationSlotCollector{log: config.logger}, nil +func NewPGReplicationSlotCollector(config CollectorConfig) (Collector, error) { + return &PGReplicationSlotCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_roles.go b/collector/pg_roles.go index 626dbb44f..9b569520f 100644 --- a/collector/pg_roles.go +++ b/collector/pg_roles.go @@ -31,9 +31,9 @@ type PGRolesCollector struct { log *slog.Logger } -func NewPGRolesCollector(config collectorConfig) (Collector, error) { +func NewPGRolesCollector(config CollectorConfig) (Collector, error) { return &PGRolesCollector{ - log: config.logger, + log: config.Logger, }, nil } diff --git a/collector/pg_stat_activity_autovacuum.go b/collector/pg_stat_activity_autovacuum.go index f08029d18..a1a072d18 100644 --- a/collector/pg_stat_activity_autovacuum.go +++ b/collector/pg_stat_activity_autovacuum.go @@ -30,8 +30,8 @@ type PGStatActivityAutovacuumCollector struct { log *slog.Logger } -func NewPGStatActivityAutovacuumCollector(config collectorConfig) (Collector, error) { - return &PGStatActivityAutovacuumCollector{log: config.logger}, nil +func NewPGStatActivityAutovacuumCollector(config CollectorConfig) (Collector, error) { + return &PGStatActivityAutovacuumCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_stat_bgwriter.go b/collector/pg_stat_bgwriter.go index 6e3bd09cb..b071647f2 100644 --- a/collector/pg_stat_bgwriter.go +++ b/collector/pg_stat_bgwriter.go @@ -30,7 +30,7 @@ func init() { type PGStatBGWriterCollector struct { } -func NewPGStatBGWriterCollector(collectorConfig) (Collector, error) { +func NewPGStatBGWriterCollector(CollectorConfig) (Collector, error) { return &PGStatBGWriterCollector{}, nil } diff --git a/collector/pg_stat_checkpointer.go b/collector/pg_stat_checkpointer.go index 31e9c5d62..edfd9396d 100644 --- a/collector/pg_stat_checkpointer.go +++ b/collector/pg_stat_checkpointer.go @@ -34,8 +34,8 @@ type PGStatCheckpointerCollector struct { log *slog.Logger } -func NewPGStatCheckpointerCollector(config collectorConfig) (Collector, error) { - return &PGStatCheckpointerCollector{log: config.logger}, nil +func NewPGStatCheckpointerCollector(config CollectorConfig) (Collector, error) { + return &PGStatCheckpointerCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_stat_database.go b/collector/pg_stat_database.go index b9210740f..131a08577 100644 --- a/collector/pg_stat_database.go +++ b/collector/pg_stat_database.go @@ -34,8 +34,8 @@ type PGStatDatabaseCollector struct { log *slog.Logger } -func NewPGStatDatabaseCollector(config collectorConfig) (Collector, error) { - return &PGStatDatabaseCollector{log: config.logger}, nil +func NewPGStatDatabaseCollector(config CollectorConfig) (Collector, error) { + return &PGStatDatabaseCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_stat_progress_vacuum.go b/collector/pg_stat_progress_vacuum.go index f8083a49f..158ec4800 100644 --- a/collector/pg_stat_progress_vacuum.go +++ b/collector/pg_stat_progress_vacuum.go @@ -31,8 +31,8 @@ type PGStatProgressVacuumCollector struct { log *slog.Logger } -func NewPGStatProgressVacuumCollector(config collectorConfig) (Collector, error) { - return &PGStatProgressVacuumCollector{log: config.logger}, nil +func NewPGStatProgressVacuumCollector(config CollectorConfig) (Collector, error) { + return &PGStatProgressVacuumCollector{log: config.Logger}, nil } var vacuumPhases = []string{ diff --git a/collector/pg_stat_statements.go b/collector/pg_stat_statements.go index d9a29ea65..3f66a9437 100644 --- a/collector/pg_stat_statements.go +++ b/collector/pg_stat_statements.go @@ -55,9 +55,9 @@ type PGStatStatementsCollector struct { statementLength uint } -func NewPGStatStatementsCollector(config collectorConfig) (Collector, error) { +func NewPGStatStatementsCollector(config CollectorConfig) (Collector, error) { return &PGStatStatementsCollector{ - log: config.logger, + log: config.Logger, includeQueryStatement: *includeQueryFlag, statementLength: *statementLengthFlag, }, nil diff --git a/collector/pg_stat_user_tables.go b/collector/pg_stat_user_tables.go index ad8bcace7..d41e14560 100644 --- a/collector/pg_stat_user_tables.go +++ b/collector/pg_stat_user_tables.go @@ -31,8 +31,8 @@ type PGStatUserTablesCollector struct { log *slog.Logger } -func NewPGStatUserTablesCollector(config collectorConfig) (Collector, error) { - return &PGStatUserTablesCollector{log: config.logger}, nil +func NewPGStatUserTablesCollector(config CollectorConfig) (Collector, error) { + return &PGStatUserTablesCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_stat_walreceiver.go b/collector/pg_stat_walreceiver.go index ea0db4558..2f3ac0fcf 100644 --- a/collector/pg_stat_walreceiver.go +++ b/collector/pg_stat_walreceiver.go @@ -31,8 +31,8 @@ type PGStatWalReceiverCollector struct { const statWalReceiverSubsystem = "stat_wal_receiver" -func NewPGStatWalReceiverCollector(config collectorConfig) (Collector, error) { - return &PGStatWalReceiverCollector{log: config.logger}, nil +func NewPGStatWalReceiverCollector(config CollectorConfig) (Collector, error) { + return &PGStatWalReceiverCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_statio_user_indexes.go b/collector/pg_statio_user_indexes.go index c53f52185..3d441bc43 100644 --- a/collector/pg_statio_user_indexes.go +++ b/collector/pg_statio_user_indexes.go @@ -30,8 +30,8 @@ type PGStatioUserIndexesCollector struct { const statioUserIndexesSubsystem = "statio_user_indexes" -func NewPGStatioUserIndexesCollector(config collectorConfig) (Collector, error) { - return &PGStatioUserIndexesCollector{log: config.logger}, nil +func NewPGStatioUserIndexesCollector(config CollectorConfig) (Collector, error) { + return &PGStatioUserIndexesCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_statio_user_tables.go b/collector/pg_statio_user_tables.go index 48f6438f2..e5ccaaa40 100644 --- a/collector/pg_statio_user_tables.go +++ b/collector/pg_statio_user_tables.go @@ -31,8 +31,8 @@ type PGStatIOUserTablesCollector struct { log *slog.Logger } -func NewPGStatIOUserTablesCollector(config collectorConfig) (Collector, error) { - return &PGStatIOUserTablesCollector{log: config.logger}, nil +func NewPGStatIOUserTablesCollector(config CollectorConfig) (Collector, error) { + return &PGStatIOUserTablesCollector{log: config.Logger}, nil } var ( diff --git a/collector/pg_wal.go b/collector/pg_wal.go index afa8fcef6..183ec76ea 100644 --- a/collector/pg_wal.go +++ b/collector/pg_wal.go @@ -28,7 +28,7 @@ func init() { type PGWALCollector struct { } -func NewPGWALCollector(config collectorConfig) (Collector, error) { +func NewPGWALCollector(config CollectorConfig) (Collector, error) { return &PGWALCollector{}, nil } diff --git a/collector/pg_xlog_location.go b/collector/pg_xlog_location.go index 5f091471f..2008a04fb 100644 --- a/collector/pg_xlog_location.go +++ b/collector/pg_xlog_location.go @@ -31,8 +31,8 @@ type PGXlogLocationCollector struct { log *slog.Logger } -func NewPGXlogLocationCollector(config collectorConfig) (Collector, error) { - return &PGXlogLocationCollector{log: config.logger}, nil +func NewPGXlogLocationCollector(config CollectorConfig) (Collector, error) { + return &PGXlogLocationCollector{log: config.Logger}, nil } var ( diff --git a/collector/probe.go b/collector/probe.go index e40d6fee1..ff4059ef5 100644 --- a/collector/probe.go +++ b/collector/probe.go @@ -45,9 +45,9 @@ func NewProbeCollector(logger *slog.Logger, excludeDatabases []string, registry collectors[key] = collector } else { collector, err := factories[key]( - collectorConfig{ - logger: logger.With("collector", key), - excludeDatabases: excludeDatabases, + CollectorConfig{ + Logger: logger.With("collector", key), + ExcludeDatabases: excludeDatabases, }) if err != nil { return nil, err