Adding additional stats work

Signed-off-by: Matt Lord <[email protected]>

go/vt/vttablet/tabletserver/vstreamer/engine_test.go

@@ -23,6 +23,8 @@ import (
 
 	"context"
 
+	"github.com/stretchr/testify/require"
+
 	"vitess.io/vitess/go/mysql/fakesqldb"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
@@ -251,4 +253,6 @@ func TestVStreamerWaitForMySQL(t *testing.T) {
 			}
 		})
 	}
+
+	require.Equal(t, engine.rowStreamerWaits.Counts()["VStreamerTest.waitForMySQL"], int64(2))
 }

go/vt/vttablet/tabletserver/vstreamer/rowstreamer.go

@@ -259,7 +259,7 @@ func (rs *rowStreamer) buildSelect() (string, error) {
 }
 
 func (rs *rowStreamer) streamQuery(conn *snapshotConn, send func(*binlogdatapb.VStreamRowsResponse) error) error {
-	// Let's be sure we MySQL is in good shape to stream rows
+	// Let's be sure MySQL is in good shape to stream rows
 	if err := rs.vse.waitForMySQL(rs.ctx, rs.cp); err != nil {
 		return err
 	}

go/vt/vttablet/tabletserver/vstreamer/uvstreamer_flaky_test.go

@@ -316,6 +316,7 @@ func resetMetrics(t *testing.T) {
 	engine.resultStreamerNumRows.Reset()
 	engine.rowStreamerNumRows.Reset()
 	engine.vstreamerPhaseTimings.Reset()
+	engine.rowStreamerWaits.Reset()
 }
 
 func validateMetrics(t *testing.T) {
@@ -325,6 +326,7 @@ func validateMetrics(t *testing.T) {
 	require.Equal(t, engine.vstreamerPhaseTimings.Counts()["VStreamerTest.copy"], int64(3))
 	require.Equal(t, engine.vstreamerPhaseTimings.Counts()["VStreamerTest.catchup"], int64(2))
 	require.Equal(t, engine.vstreamerPhaseTimings.Counts()["VStreamerTest.fastforward"], int64(2))
+	require.Equal(t, engine.rowStreamerWaits.Counts()["VStreamerTest.waitForMySQL"], int64(0))
 }
 
 func insertMultipleRows(t *testing.T, table string, idx int, numRows int) {