fix test

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

Author: harshit-gangal

go/vt/vttablet/endtoend/transaction_test.go

@@ -892,6 +892,9 @@ func TestSkipUserMetrics(t *testing.T) {
 
 	// Enable SkipUserMetrics and re-run tests
 	framework.Server.Config().SkipUserMetrics = true
+	defer func() {
+		framework.Server.Config().SkipUserMetrics = false
+	}()
 	vstart = framework.DebugVars()
 	runQueries()
 

go/vt/vttablet/tabletserver/dt_executor_test.go

@@ -31,12 +31,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
-	"vitess.io/vitess/go/streamlog"
-
 	"vitess.io/vitess/go/event/syslogger"
 	"vitess.io/vitess/go/mysql/fakesqldb"
 	"vitess.io/vitess/go/mysql/sqlerror"
 	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/streamlog"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/vtenv"
@@ -58,7 +57,7 @@ func TestTxExecutorEmptyPrepare(t *testing.T) {
 	// taint the connection.
 	sc, err := tsv.te.txPool.GetAndLock(txid, "taint")
 	require.NoError(t, err)
-	sc.Taint(ctx, nil)
+	sc.Taint(ctx, tsv.te.reservedConnStats)
 	sc.Unlock()
 
 	err = txe.Prepare(txid, "aa")
@@ -80,7 +79,7 @@ func TestExecutorPrepareFailure(t *testing.T) {
 	// taint the connection.
 	sc, err := tsv.te.txPool.GetAndLock(txid, "taint")
 	require.NoError(t, err)
-	sc.Taint(ctx, nil)
+	sc.Taint(ctx, tsv.te.reservedConnStats)
 	sc.Unlock()
 
 	// try 2pc commit of Metadata Manager.
@@ -374,7 +373,7 @@ func TestExecutorStartCommitFailure(t *testing.T) {
 	// taint the connection.
 	sc, err := tsv.te.txPool.GetAndLock(txid, "taint")
 	require.NoError(t, err)
-	sc.Taint(ctx, nil)
+	sc.Taint(ctx, tsv.te.reservedConnStats)
 	sc.Unlock()
 
 	// add rollback state update expectation

go/vt/vttablet/tabletserver/stateful_connection_pool_test.go

@@ -27,6 +27,7 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	querypb "vitess.io/vitess/go/vt/proto/query"
+	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/tx"
 )
 
@@ -96,24 +97,25 @@ func TestStatefulPoolShutdownNonTx(t *testing.T) {
 	pool := newActivePool()
 	params := dbconfigs.New(db.ConnParams())
 	pool.Open(params, params, params)
+	rcStats := servenv.NewExporter("TestStatefulPoolShutdownNonTx", "").NewTimings("rconn", "test1", "test2")
 
 	// conn1 non-tx, not in use.
 	conn1, err := pool.NewConn(ctx, &querypb.ExecuteOptions{}, nil)
 	require.NoError(t, err)
-	conn1.Taint(ctx, nil)
+	conn1.Taint(ctx, rcStats)
 	conn1.Unlock()
 
 	// conn2 tx, not in use.
 	conn2, err := pool.NewConn(ctx, &querypb.ExecuteOptions{}, nil)
 	require.NoError(t, err)
-	conn2.Taint(ctx, nil)
+	conn2.Taint(ctx, rcStats)
 	conn2.txProps = &tx.Properties{}
 	conn2.Unlock()
 
 	// conn3 non-tx, in use.
 	conn3, err := pool.NewConn(ctx, &querypb.ExecuteOptions{}, nil)
 	require.NoError(t, err)
-	conn3.Taint(ctx, nil)
+	conn3.Taint(ctx, rcStats)
 
 	// After ShutdownNonTx, conn1 should be closed, but not conn3.
 	pool.ShutdownNonTx()