fix types

odonate · Feb 11, 2023 · 994d8c8 · 994d8c8
1 parent 9ee55d4
commit 994d8c8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 42 deletions.
diff --git a/exporter/collectors/pg_stat_statements.go b/exporter/collectors/pg_stat_statements.go
@@ -38,7 +38,7 @@ type PgStatStatementsCollector struct {
 
 // NewPgStatStatementsCollector instantiates and returns a new PgStatStatementsCollector.
 func NewPgStatStatementsCollector(db *db.Client) *PgStatStatementsCollector {
-	variableLabels := []string{"rolname", "datname", "queryid"}
+	variableLabels := []string{"rolname", "datname", "queryid", "querytext"}
 	return &PgStatStatementsCollector{
 		db: db,
 
@@ -200,25 +200,25 @@ func (c *PgStatStatementsCollector) Scrape(ch chan<- prometheus.Metric) error {
 	}
 
 	for _, stat := range statementStats {
-		ch <- prometheus.MustNewConstMetric(c.calls, prometheus.CounterValue, float64(stat.Calls), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.totalTimeSeconds, prometheus.CounterValue, float64(stat.TotalTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.minTimeSeconds, prometheus.GaugeValue, float64(stat.MinTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.maxTimeSeconds, prometheus.GaugeValue, float64(stat.MaxTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.meanTimeSeconds, prometheus.GaugeValue, float64(stat.MeanTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.stdDevTimeSeconds, prometheus.GaugeValue, float64(stat.StdDevTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.rows, prometheus.CounterValue, float64(stat.Rows), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.sharedBlksHit, prometheus.CounterValue, float64(stat.SharedBlksHit), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.sharedBlksRead, prometheus.CounterValue, float64(stat.SharedBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.sharedBlksDirtied, prometheus.CounterValue, float64(stat.SharedBlksDirtied), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.sharedBlksWritten, prometheus.CounterValue, float64(stat.SharedBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.localBlksHit, prometheus.CounterValue, float64(stat.LocalBlksHit), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.localBlksRead, prometheus.CounterValue, float64(stat.LocalBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.localBlksDirtied, prometheus.CounterValue, float64(stat.LocalBlksDirtied), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.localBlksWritten, prometheus.CounterValue, float64(stat.LocalBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.tempBlksRead, prometheus.CounterValue, float64(stat.TempBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.tempBlksWritten, prometheus.CounterValue, float64(stat.TempBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.blkReadTimeSeconds, prometheus.CounterValue, float64(stat.BlkReadTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
-		ch <- prometheus.MustNewConstMetric(c.blkWriteTimeSeconds, prometheus.CounterValue, float64(stat.BlkWriteTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID))
+		ch <- prometheus.MustNewConstMetric(c.calls, prometheus.CounterValue, float64(stat.Calls), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.totalTimeSeconds, prometheus.CounterValue, stat.TotalTimeSeconds, stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.minTimeSeconds, prometheus.GaugeValue, stat.MinTimeSeconds, stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.maxTimeSeconds, prometheus.GaugeValue, stat.MaxTimeSeconds, stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.meanTimeSeconds, prometheus.GaugeValue, stat.MeanTimeSeconds, stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.stdDevTimeSeconds, prometheus.GaugeValue, stat.StdDevTimeSeconds, stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.rows, prometheus.CounterValue, float64(stat.Rows), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.sharedBlksHit, prometheus.CounterValue, float64(stat.SharedBlksHit), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.sharedBlksRead, prometheus.CounterValue, float64(stat.SharedBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.sharedBlksDirtied, prometheus.CounterValue, float64(stat.SharedBlksDirtied), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.sharedBlksWritten, prometheus.CounterValue, float64(stat.SharedBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.localBlksHit, prometheus.CounterValue, float64(stat.LocalBlksHit), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.localBlksRead, prometheus.CounterValue, float64(stat.LocalBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.localBlksDirtied, prometheus.CounterValue, float64(stat.LocalBlksDirtied), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.localBlksWritten, prometheus.CounterValue, float64(stat.LocalBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.tempBlksRead, prometheus.CounterValue, float64(stat.TempBlksRead), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.tempBlksWritten, prometheus.CounterValue, float64(stat.TempBlksWritten), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.blkReadTimeSeconds, prometheus.CounterValue, float64(stat.BlkReadTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
+		ch <- prometheus.MustNewConstMetric(c.blkWriteTimeSeconds, prometheus.CounterValue, float64(stat.BlkWriteTimeSeconds), stat.RolName, stat.DatName, strconv.Itoa(stat.QueryID), stat.QueryText)
 	}
 	return nil
 }
diff --git a/exporter/db/model/model.go b/exporter/db/model/model.go
@@ -47,26 +47,27 @@ type PgStatUserTable struct {
 
 // PgStatStatement contiains information on user tables.
 type PgStatStatement struct {
-	RolName             string `db:"rolname"`
-	DatName             string `db:"datname"`
-	QueryID             int    `db:"queryid"`
-	Calls               int    `db:"calls"`
-	TotalTimeSeconds    int    `db:"total_time_seconds"`
-	MinTimeSeconds      int    `db:"min_time_seconds"`
-	MaxTimeSeconds      int    `db:"max_time_seconds"`
-	MeanTimeSeconds     int    `db:"mean_time_seconds"`
-	StdDevTimeSeconds   int    `db:"stddev_time_seconds"`
-	Rows                int    `db:"rows"`
-	SharedBlksHit       int    `db:"shared_blks_hit"`
-	SharedBlksRead      int    `db:"shared_blks_read"`
-	SharedBlksDirtied   int    `db:"shared_blks_dirtied"`
-	SharedBlksWritten   int    `db:"shared_blks_written"`
-	LocalBlksHit        int    `db:"local_blks_hit"`
-	LocalBlksRead       int    `db:"local_blks_read"`
-	LocalBlksDirtied    int    `db:"local_blks_dirtied"`
-	LocalBlksWritten    int    `db:"local_blks_written"`
-	TempBlksRead        int    `db:"temp_blks_read"`
-	TempBlksWritten     int    `db:"temp_blks_written"`
-	BlkReadTimeSeconds  int    `db:"blk_read_time_seconds"`
-	BlkWriteTimeSeconds int    `db:"blk_write_time_seconds"`
+	RolName             string  `db:"rolname"`
+	DatName             string  `db:"datname"`
+	QueryID             int     `db:"queryid"`
+	QueryText           string  `db:"querytext"`
+	Calls               int     `db:"calls"`
+	TotalTimeSeconds    float64 `db:"total_time_seconds"`
+	MinTimeSeconds      float64 `db:"min_time_seconds"`
+	MaxTimeSeconds      float64 `db:"max_time_seconds"`
+	MeanTimeSeconds     float64 `db:"mean_time_seconds"`
+	StdDevTimeSeconds   float64 `db:"stddev_time_seconds"`
+	Rows                int     `db:"rows"`
+	SharedBlksHit       int     `db:"shared_blks_hit"`
+	SharedBlksRead      int     `db:"shared_blks_read"`
+	SharedBlksDirtied   int     `db:"shared_blks_dirtied"`
+	SharedBlksWritten   int     `db:"shared_blks_written"`
+	LocalBlksHit        int     `db:"local_blks_hit"`
+	LocalBlksRead       int     `db:"local_blks_read"`
+	LocalBlksDirtied    int     `db:"local_blks_dirtied"`
+	LocalBlksWritten    int     `db:"local_blks_written"`
+	TempBlksRead        int     `db:"temp_blks_read"`
+	TempBlksWritten     int     `db:"temp_blks_written"`
+	BlkReadTimeSeconds  int     `db:"blk_read_time_seconds"`
+	BlkWriteTimeSeconds int     `db:"blk_write_time_seconds"`
 }