Skip to content

Commit c7f879a

Browse files
knarflif7o
authored andcommitted
[receiver/mysql] client, convert NULL to int64 (open-telemetry#34411)
**Description:** <Describe what has changed.> bug fix, receiver/mysql client.go raise error when the TABLE_ROWS column is NULL, fix it in the SQL query, convert the NULL to 0. **Link to tracking Issue:** <Issue number if applicable> open-telemetry#34195 **Testing:** <Describe what testing was performed and which tests were added.> run command "make test" in the receiver/mysqlreceiver, all the test case passed. **Documentation:** <Describe the documentation added.> --------- Signed-off-by: Jian Li <[email protected]>
1 parent 8ca939c commit c7f879a

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: mysqlreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: mysql client raise error when the TABLE_ROWS column is NULL, convert NULL to int64
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [34195]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

receiver/mysqlreceiver/client.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,11 @@ func (c *mySQLClient) getInnodbStats() (map[string]string, error) {
243243

244244
// getTableStats queries the db for information_schema table size metrics.
245245
func (c *mySQLClient) getTableStats() ([]TableStats, error) {
246-
query := "SELECT TABLE_SCHEMA, TABLE_NAME, TABLE_ROWS, " +
247-
"AVG_ROW_LENGTH, DATA_LENGTH, INDEX_LENGTH " +
246+
query := "SELECT TABLE_SCHEMA, TABLE_NAME, " +
247+
"COALESCE(TABLE_ROWS, 0) as TABLE_ROWS, " +
248+
"COALESCE(AVG_ROW_LENGTH, 0) as AVG_ROW_LENGTH, " +
249+
"COALESCE(DATA_LENGTH, 0) as DATA_LENGTH, " +
250+
"COALESCE(INDEX_LENGTH, 0) as INDEX_LENGTH " +
248251
"FROM information_schema.TABLES " +
249252
"WHERE TABLE_SCHEMA NOT in ('information_schema', 'sys');"
250253
rows, err := c.client.Query(query)

0 commit comments

Comments
 (0)