From 672c62308c0f26033eea4af89600047942392f01 Mon Sep 17 00:00:00 2001 From: Cole Mackenzie Date: Sun, 5 Feb 2023 20:27:52 -0800 Subject: [PATCH] rename everything to use pgxpool instead of just pgx --- README.md | 2 +- _example/example.go | 4 ++-- collector.go | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0a0e509..2cf95ca 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ func main() { panic(err) } - prometheus.MustRegister(pgxpool_prometheus.NewPgxStatsCollector(pool, "database")) + prometheus.MustRegister(pgxpool_prometheus.NewPgxPoolStatsCollector(pool, "database")) log.Fatalf("Error: %v", http.ListenAndServe(":8080", promhttp.Handler())) } diff --git a/_example/example.go b/_example/example.go index 4f035c8..d84f46a 100644 --- a/_example/example.go +++ b/_example/example.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - pgx_prometheus "github.com/cmackenzie1/pgxpool-prometheus" + "github.com/cmackenzie1/pgxpool-prometheus" "github.com/jackc/pgx/v5/pgxpool" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -25,7 +25,7 @@ func main() { } defer pool.Close() - prometheus.MustRegister(pgx_prometheus.NewPgxStatsCollector(pool, "database")) + prometheus.MustRegister(pgxpool_prometheus.NewPgxPoolStatsCollector(pool, "database")) if err := pool.QueryRow(context.Background(), "SELECT 1").Scan(nil); err != nil { panic(err) diff --git a/collector.go b/collector.go index 4cae8a5..7d95066 100644 --- a/collector.go +++ b/collector.go @@ -1,13 +1,13 @@ -package pgx_prometheus +package pgxpool_prometheus import ( "github.com/jackc/pgx/v5/pgxpool" "github.com/prometheus/client_golang/prometheus" ) -// PgxPoolCollector is a Prometheus collector for pgx metrics. +// PgxPoolStatsCollector is a Prometheus collector for pgx metrics. // It implements the prometheus.Collector interface. -type PgxPoolCollector struct { +type PgxPoolStatsCollector struct { db *pgxpool.Pool acquireConns *prometheus.Desc @@ -22,16 +22,16 @@ type PgxPoolCollector struct { maxIdleDestroyCount *prometheus.Desc } -// NewPgxStatsCollector returns a new pgxCollector. +// NewPgxPoolStatsCollector returns a new pgxCollector. // The dbName parameter is used to set the "db" label on the metrics. // The db parameter is the pgxpool.Pool to collect metrics from. // The db parameter must not be nil. // The dbName parameter must not be empty. -func NewPgxStatsCollector(db *pgxpool.Pool, dbName string) *PgxPoolCollector { +func NewPgxPoolStatsCollector(db *pgxpool.Pool, dbName string) *PgxPoolStatsCollector { fqName := func(name string) string { return prometheus.BuildFQName("pgx", "pool", name) } - return &PgxPoolCollector{ + return &PgxPoolStatsCollector{ db: db, acquireConns: prometheus.NewDesc( fqName("acquire_connections"), @@ -97,7 +97,7 @@ func NewPgxStatsCollector(db *pgxpool.Pool, dbName string) *PgxPoolCollector { } // Describe implements the prometheus.Collector interface. -func (p PgxPoolCollector) Describe(descs chan<- *prometheus.Desc) { +func (p PgxPoolStatsCollector) Describe(descs chan<- *prometheus.Desc) { descs <- p.acquireConns descs <- p.canceledAcquireCount descs <- p.constructingConns @@ -111,7 +111,7 @@ func (p PgxPoolCollector) Describe(descs chan<- *prometheus.Desc) { } // Collect implements the prometheus.Collector interface. -func (p PgxPoolCollector) Collect(metrics chan<- prometheus.Metric) { +func (p PgxPoolStatsCollector) Collect(metrics chan<- prometheus.Metric) { stats := p.db.Stat() metrics <- prometheus.MustNewConstMetric(p.acquireConns, prometheus.GaugeValue, float64(stats.AcquiredConns()))