Mysql metrics/query perf (#56)

* normalised statement counts, cumulative time per statement * changed to event time limit to be maxInt64 * removed print statements * nit * Update go.mod * enabled statement event time * small fix * Added count-star datapoint
middleware-labs · Dec 4, 2024 · 4352aa2 · 4352aa2
1 parent 46875ea
commit 4352aa2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/receiver/mysqlreceiver/client.go b/receiver/mysqlreceiver/client.go
@@ -83,6 +83,7 @@ type StatementEventStats struct {
 	countSortMergePasses      int64
 	countSortRows             int64
 	countNoIndexUsed          int64
+	countStar                 int64
 }
 
 type tableLockWaitEventStats struct {
@@ -348,7 +349,7 @@ func (c *mySQLClient) getStatementEventsStats() ([]StatementEventStats, error) {
 		"LEFT(DIGEST_TEXT, %d) as DIGEST_TEXT, SUM_TIMER_WAIT, SUM_ERRORS,"+
 		"SUM_WARNINGS, SUM_ROWS_AFFECTED, SUM_ROWS_SENT, SUM_ROWS_EXAMINED,"+
 		"SUM_CREATED_TMP_DISK_TABLES, SUM_CREATED_TMP_TABLES, SUM_SORT_MERGE_PASSES,"+
-		"SUM_SORT_ROWS, SUM_NO_INDEX_USED "+
+		"SUM_SORT_ROWS, SUM_NO_INDEX_USED , COUNT_STAR "+
 		"FROM performance_schema.events_statements_summary_by_digest "+
 		"WHERE SCHEMA_NAME NOT IN ('mysql', 'performance_schema', 'information_schema') "+
 		"AND last_seen > DATE_SUB(NOW(), INTERVAL %d SECOND) "+
@@ -360,6 +361,7 @@ func (c *mySQLClient) getStatementEventsStats() ([]StatementEventStats, error) {
 
 	rows, err := c.client.Query(query)
 	if err != nil {
+		fmt.Println(err.Error())
 		return nil, err
 	}
 	defer rows.Close()
@@ -370,13 +372,12 @@ func (c *mySQLClient) getStatementEventsStats() ([]StatementEventStats, error) {
 		err := rows.Scan(&s.schema, &s.digest, &s.digestText,
 			&s.sumTimerWait, &s.countErrors, &s.countWarnings,
 			&s.countRowsAffected, &s.countRowsSent, &s.countRowsExamined, &s.countCreatedTmpDiskTables,
-			&s.countCreatedTmpTables, &s.countSortMergePasses, &s.countSortRows, &s.countNoIndexUsed)
+			&s.countCreatedTmpTables, &s.countSortMergePasses, &s.countSortRows, &s.countNoIndexUsed, &s.countStar)
 		if err != nil {
 			return nil, err
 		}
 		stats = append(stats, s)
 	}
-
 	return stats, nil
 }
 

diff --git a/receiver/mysqlreceiver/config.go b/receiver/mysqlreceiver/config.go
@@ -4,6 +4,7 @@
 package mysqlreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver"
 
 import (
+	"math"
 	"time"
 
 	"go.opentelemetry.io/collector/config/confignet"
@@ -18,7 +19,7 @@ import (
 const (
 	defaultStatementEventsDigestTextLimit = 120
 	defaultStatementEventsLimit           = 250
-	defaultStatementEventsTimeLimit       = 24 * time.Hour
+	defaultStatementEventsTimeLimit       = time.Duration(math.MaxInt64)
 )
 
 type Config struct {

diff --git a/receiver/mysqlreceiver/internal/metadata/generated_config.go b/receiver/mysqlreceiver/internal/metadata/generated_config.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/mysqlreceiver/metadata.yaml b/receiver/mysqlreceiver/metadata.yaml
@@ -546,7 +546,7 @@ metrics:
       aggregation_temporality: cumulative
     attributes: []
   mysql.statement_event.count:
-    enabled: false
+    enabled: true
     description: Summary of current and recent statement events.
     unit: "1"
     sum:
@@ -555,7 +555,7 @@ metrics:
       aggregation_temporality: cumulative
     attributes: [schema, digest, digest_text, event_state]
   mysql.statement_event.wait.time:
-    enabled: false
+    enabled: true
     description: The total wait time of the summarized timed events.
     unit: ns
     sum: