Skip to content

Commit 18c62ac

Browse files
Merge pull request #920 from prometheus/cristian/fix-events-stmts-query-printf
Fix query on perf_schema.events_statements_summary_by_digest
2 parents c325602 + 67f514f commit 18c62ac

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

collector/perf_schema_events_statements.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package collector
1717

1818
import (
1919
"context"
20+
"fmt"
2021
"log/slog"
2122

2223
"github.com/alecthomas/kingpin/v2"
@@ -250,6 +251,13 @@ func (ScrapePerfEventsStatements) Scrape(ctx context.Context, instance *instance
250251
perfQuery = perfEventsStatementsQueryMySQL
251252
}
252253

254+
perfQuery = fmt.Sprintf(
255+
perfQuery,
256+
*perfEventsStatementsDigestTextLimit,
257+
*perfEventsStatementsTimeLimit,
258+
*perfEventsStatementsLimit,
259+
)
260+
253261
db := instance.getDB()
254262
// Timers here are returned in picoseconds.
255263
perfSchemaEventsStatementsRows, err := db.QueryContext(ctx, perfQuery)

collector/perf_schema_events_statements_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package collector
1515

1616
import (
1717
"context"
18+
"fmt"
1819
"testing"
1920

2021
"github.com/DATA-DOG/go-sqlmock"
@@ -50,7 +51,8 @@ func TestScrapePerfEventsStatements(t *testing.T) {
5051
100, 1,
5152
100, 150, 200)
5253

53-
mock.ExpectQuery(sanitizeQuery(perfEventsStatementsQuery)).WillReturnRows(rows)
54+
query := fmt.Sprintf(perfEventsStatementsQuery, 120, 86400, 250)
55+
mock.ExpectQuery(sanitizeQuery(query)).WillReturnRows(rows)
5456

5557
ch := make(chan prometheus.Metric)
5658
go func() {
@@ -125,7 +127,8 @@ func TestScrapePerfEventsStatementsMySQL8028(t *testing.T) {
125127
100, 1,
126128
100, 150, 200)
127129

128-
mock.ExpectQuery(sanitizeQuery(perfEventsStatementsQueryMySQL)).WillReturnRows(rows)
130+
query := fmt.Sprintf(perfEventsStatementsQueryMySQL, 120, 86400, 250)
131+
mock.ExpectQuery(sanitizeQuery(query)).WillReturnRows(rows)
129132

130133
ch := make(chan prometheus.Metric)
131134
go func() {

0 commit comments

Comments
 (0)