Add sql text counts stats to vtcombo,vtgate+vttablet (vitessio#…

…15897)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Deepthi Sigireddi <deepthi.sigireddi@gmail.com>

go/vt/vtgate/vtgate.go

@@ -184,10 +184,10 @@ type VTGate struct {
  // stats objects.
  // TODO(sougou): This needs to be cleaned up. There
  // are global vars that depend on this member var.
- timings *stats.MultiTimings
- rowsReturned *stats.CountersWithMultiLabels
- rowsAffected *stats.CountersWithMultiLabels
- sqlTextCounts *stats.CountersWithMultiLabels
+ timings  *stats.MultiTimings
+ rowsReturned  *stats.CountersWithMultiLabels
+ rowsAffected  *stats.CountersWithMultiLabels
+ queryTextCharsProcessed *stats.CountersWithMultiLabels
 
  // the throttled loggers for all errors, one per API entry
  logExecute *logutil.ThrottledLogger
@@ -438,7 +438,7 @@ func (vtg *VTGate) Execute(ctx context.Context, session *vtgatepb.Session, sql s
  if err == nil {
  vtg.rowsReturned.Add(statsKey, int64(len(qr.Rows)))
  vtg.rowsAffected.Add(statsKey, int64(qr.RowsAffected))
- vtg.sqlTextCounts.Add(statsKey, int64(len(sql)))
+ vtg.queryTextCharsProcessed.Add(statsKey, int64(len(sql)))
  return session, qr, nil
  }
 

go/vt/vttablet/tabletserver/query_engine.go

@@ -171,7 +171,7 @@ type QueryEngine struct {
  consolidatorMode sync2.AtomicString
 
  // stats
- queryCounts, queryTimes, queryRowCounts, queryErrorCounts, queryRowsAffected, queryRowsReturned, querySQLTextCounts *stats.CountersWithMultiLabels
+ queryCounts, queryTimes, queryRowCounts, queryErrorCounts, queryRowsAffected, queryRowsReturned, queryTextCharsProcessed *stats.CountersWithMultiLabels
 
  // stats flags
  enablePerWorkloadTableMetrics bool
@@ -261,7 +261,7 @@ func NewQueryEngine(env tabletenv.Env, se *schema.Engine) *QueryEngine {
  qe.queryRowCounts = env.Exporter().NewCountersWithMultiLabels("QueryRowCounts", "(DEPRECATED - use QueryRowsAffected and QueryRowsReturned instead) query row counts", labels)
  qe.queryRowsAffected = env.Exporter().NewCountersWithMultiLabels("QueryRowsAffected", "query rows affected", labels)
  qe.queryRowsReturned = env.Exporter().NewCountersWithMultiLabels("QueryRowsReturned", "query rows returned", labels)
- qe.querySQLTextCounts = env.Exporter().NewCountersWithMultiLabels("QuerySQLTextCounts", "query sql text counts", labels)
+ qe.queryTextCharsProcessed = env.Exporter().NewCountersWithMultiLabels("QueryTextCharactersProcessed", "query text characters processed", labels)
  qe.queryErrorCounts = env.Exporter().NewCountersWithMultiLabels("QueryErrorCounts", "query error counts", labels)
 
  env.Exporter().HandleFunc("/debug/hotrows", qe.txSerializer.ServeHTTP)
@@ -502,7 +502,7 @@ func (qe *QueryEngine) AddStats(plan *TabletPlan, tableName, workload string, qu
  qe.queryRowCounts.Add(keys, rowsAffected)
  qe.queryErrorCounts.Add(keys, errorCount)
  if plan.FullQuery != nil {
- qe.querySQLTextCounts.Add(keys, int64(len(plan.FullQuery.Query)))
+ qe.queryTextCharsProcessed.Add(keys, int64(len(plan.FullQuery.Query)))
  }
 
  // For certain plan types like select, we only want to add their metrics to rows returned