Skip to content

fix(database_observability.mysql): Make query sample text nullable in MySQL query details collector [backport] #5519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristiangreco merged 1 commit into from
Feb 12, 2026
Merged

fix(database_observability.mysql): Make query sample text nullable in MySQL query details collector [backport] #5519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/component/database_observability/mysql/collector/query_details.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,17 @@ func (c *QueryDetails) tablesFromEventsStatements(ctx context.Context) error {
defer rs.Close()

for rs.Next() {
var digest, digestText, schema, sampleText string
var digest, digestText, schema string
var sampleText sql.NullString
if err := rs.Scan(&digest, &digestText, &schema, &sampleText); err != nil {
level.Error(c.logger).Log("msg", "failed to scan result set from summary table samples", "schema", schema, "err", err)
continue
}

var tables []string
var parserErr, lexerErr error
if tables, parserErr = c.tryParseTableNames(sampleText, digestText); parserErr != nil {
if tables, lexerErr = c.tryTokenizeTableNames(sampleText, digestText); lexerErr != nil {
if tables, parserErr = c.tryParseTableNames(sampleText.String, digestText); parserErr != nil {
if tables, lexerErr = c.tryTokenizeTableNames(sampleText.String, digestText); lexerErr != nil {
level.Warn(c.logger).Log("msg", "failed to extract tables from sql text", "schema", schema, "digest", digest, "parser_err", parserErr, "lexer_err", lexerErr)
continue
}
Expand Down
17 changes: 17 additions & 0 deletions internal/component/database_observability/mysql/collector/query_details_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,23 @@ func TestQueryTables(t *testing.T) {
`level="info" schema="some_schema" digest="abc123" table="some_table"`,
},
},
{
name: "null query_sample_text uses digest_text",
eventStatementsRows: [][]driver.Value{{
"abc123",
"SELECT * FROM `some_table` WHERE `id` = ?",
"some_schema",
nil, // NULL query_sample_text
}},
logsLabels: []model.LabelSet{
{"op": OP_QUERY_ASSOCIATION},
{"op": OP_QUERY_PARSED_TABLE_NAME},
},
logsLines: []string{
"level=\"info\" schema=\"some_schema\" parseable=\"true\" digest=\"abc123\" digest_text=\"SELECT * FROM `some_table` WHERE `id` = ?\"",
`level="info" schema="some_schema" digest="abc123" table="some_table"`,
},
},
}

for _, tc := range testcases {
Expand Down
Loading