fix(inputs.postgresql_extensible): Use same timestamp for each gather (…

…#15401)
influxdata · May 31, 2024 · 898b1c3 · 898b1c3
1 parent 82902eb
commit 898b1c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -114,17 +114,21 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
 		dbVersion = 0
 	}
 
+	// set default timestamp to Now and use for all generated metrics during
+	// the same Gather call
+	timestamp := time.Now()
+
 	// We loop in order to process each query
 	// Query is not run if Database version does not match the query version.
 	for _, q := range p.Query {
 		if q.MinVersion <= dbVersion && (q.MaxVersion == 0 || q.MaxVersion > dbVersion) {
-			acc.AddError(p.gatherMetricsFromQuery(acc, q))
+			acc.AddError(p.gatherMetricsFromQuery(acc, q, timestamp))
 		}
 	}
 	return nil
 }
 
-func (p *Postgresql) gatherMetricsFromQuery(acc telegraf.Accumulator, q query) error {
+func (p *Postgresql) gatherMetricsFromQuery(acc telegraf.Accumulator, q query, timestamp time.Time) error {
 	rows, err := p.service.DB.Query(q.Sqlquery)
 	if err != nil {
 		return err
@@ -139,7 +143,7 @@ func (p *Postgresql) gatherMetricsFromQuery(acc telegraf.Accumulator, q query) e
 	}
 
 	for rows.Next() {
-		if err := p.accRow(acc, rows, columns, q); err != nil {
+		if err := p.accRow(acc, rows, columns, q, timestamp); err != nil {
 			return err
 		}
 	}
@@ -150,7 +154,7 @@ type scanner interface {
 	Scan(dest ...interface{}) error
 }
 
-func (p *Postgresql) accRow(acc telegraf.Accumulator, row scanner, columns []string, q query) error {
+func (p *Postgresql) accRow(acc telegraf.Accumulator, row scanner, columns []string, q query, timestamp time.Time) error {
 	// this is where we'll store the column name with its *interface{}
 	columnMap := make(map[string]*interface{})
 
@@ -188,9 +192,6 @@ func (p *Postgresql) accRow(acc telegraf.Accumulator, row scanner, columns []str
 		"db":     dbname.String(),
 	}
 
-	// set default timestamp to Now
-	timestamp := time.Now()
-
 	fields := make(map[string]interface{})
 	for col, val := range columnMap {
 		p.Log.Debugf("Column: %s = %T: %v\n", col, *val, *val)

diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go b/plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
@@ -338,7 +338,7 @@ func TestAccRow(t *testing.T) {
 	}
 	for _, tt := range tests {
 		q := query{Measurement: "pgTEST", additionalTags: make(map[string]bool)}
-		require.NoError(t, p.accRow(&acc, tt.fields, columns, q))
+		require.NoError(t, p.accRow(&acc, tt.fields, columns, q, time.Now()))
 		require.Len(t, acc.Metrics, 1)
 		metric := acc.Metrics[0]
 		require.Equal(t, tt.dbName, metric.Tags["db"])