Merge pull request #920 from prometheus/cristian/fix-events-stmts-que…

…ry-printf Fix query on perf_schema.events_statements_summary_by_digest
prometheus · Feb 21, 2025 · 18c62ac · 18c62ac
2 parents c325602 + 67f514f
commit 18c62ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/collector/perf_schema_events_statements.go b/collector/perf_schema_events_statements.go
@@ -17,6 +17,7 @@ package collector
 
 import (
 	"context"
+	"fmt"
 	"log/slog"
 
 	"github.com/alecthomas/kingpin/v2"
@@ -250,6 +251,13 @@ func (ScrapePerfEventsStatements) Scrape(ctx context.Context, instance *instance
 		perfQuery = perfEventsStatementsQueryMySQL
 	}
 
+	perfQuery = fmt.Sprintf(
+		perfQuery,
+		*perfEventsStatementsDigestTextLimit,
+		*perfEventsStatementsTimeLimit,
+		*perfEventsStatementsLimit,
+	)
+
 	db := instance.getDB()
 	// Timers here are returned in picoseconds.
 	perfSchemaEventsStatementsRows, err := db.QueryContext(ctx, perfQuery)

diff --git a/collector/perf_schema_events_statements_test.go b/collector/perf_schema_events_statements_test.go
@@ -15,6 +15,7 @@ package collector
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
@@ -50,7 +51,8 @@ func TestScrapePerfEventsStatements(t *testing.T) {
 			100, 1,
 			100, 150, 200)
 
-	mock.ExpectQuery(sanitizeQuery(perfEventsStatementsQuery)).WillReturnRows(rows)
+	query := fmt.Sprintf(perfEventsStatementsQuery, 120, 86400, 250)
+	mock.ExpectQuery(sanitizeQuery(query)).WillReturnRows(rows)
 
 	ch := make(chan prometheus.Metric)
 	go func() {
@@ -125,7 +127,8 @@ func TestScrapePerfEventsStatementsMySQL8028(t *testing.T) {
 			100, 1,
 			100, 150, 200)
 
-	mock.ExpectQuery(sanitizeQuery(perfEventsStatementsQueryMySQL)).WillReturnRows(rows)
+	query := fmt.Sprintf(perfEventsStatementsQueryMySQL, 120, 86400, 250)
+	mock.ExpectQuery(sanitizeQuery(query)).WillReturnRows(rows)
 
 	ch := make(chan prometheus.Metric)
 	go func() {