Cherry-pick aba0d83 with conflicts

go/vt/topo/memorytopo/election.go

@@ -26,6 +26,11 @@ import (
 
 // NewLeaderParticipation is part of the topo.Server interface
 func (c *Conn) NewLeaderParticipation(name, id string) (topo.LeaderParticipation, error) {
+<<<<<<< HEAD
+=======
+	c.factory.callstats.Add([]string{"NewLeaderParticipation"}, 1)
+
+>>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, ErrConnectionClosed
 	}

go/vt/topo/memorytopo/memorytopo.go

@@ -142,6 +142,10 @@ func (c *Conn) dial(ctx context.Context) error {
 
 // Close is part of the topo.Conn interface.
 func (c *Conn) Close() {
+<<<<<<< HEAD
+=======
+	c.factory.callstats.Add([]string{"Close"}, 1)
+>>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	c.closed.Store(true)
 }
 

go/vt/topo/memorytopo/watch.go

@@ -25,6 +25,11 @@ import (
 
 // Watch is part of the topo.Conn interface.
 func (c *Conn) Watch(ctx context.Context, filePath string) (*topo.WatchData, <-chan *topo.WatchData, error) {
+<<<<<<< HEAD
+=======
+	c.factory.callstats.Add([]string{"Watch"}, 1)
+
+>>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, nil, ErrConnectionClosed
 	}
@@ -75,6 +80,11 @@ func (c *Conn) Watch(ctx context.Context, filePath string) (*topo.WatchData, <-c
 
 // WatchRecursive is part of the topo.Conn interface.
 func (c *Conn) WatchRecursive(ctx context.Context, dirpath string) ([]*topo.WatchDataRecursive, <-chan *topo.WatchDataRecursive, error) {
+<<<<<<< HEAD
+=======
+	c.factory.callstats.Add([]string{"WatchRecursive"}, 1)
+
+>>>>>>> aba0d83c8a (CI: Address data races on memorytopo Conn.closed (#15365))
 	if c.closed.Load() {
 		return nil, nil, ErrConnectionClosed
 	}