remove functionality to update topology from application connection handshakes

Author: Divjot Arora

x/mongo/driver/topology/connection.go

@@ -156,9 +156,6 @@ func (c *connection) connect(ctx context.Context) {
 		return
 	}
 
-	if c.config.descCallback != nil {
-		c.config.descCallback(c.desc)
-	}
 	if len(c.desc.Compression) > 0 {
 	clientMethodLoop:
 		for _, method := range c.config.compressors {

x/mongo/driver/topology/connection_options.go

@@ -8,7 +8,6 @@ import (
 
 	"go.mongodb.org/mongo-driver/event"
 	"go.mongodb.org/mongo-driver/x/mongo/driver"
-	"go.mongodb.org/mongo-driver/x/mongo/driver/description"
 	"go.mongodb.org/mongo-driver/x/mongo/driver/ocsp"
 )
 
@@ -50,7 +49,6 @@ type connectionConfig struct {
 	compressors              []string
 	zlibLevel                *int
 	zstdLevel                *int
-	descCallback             func(description.Server)
 	ocspCache                ocsp.Cache
 	disableOCSPEndpointCheck bool
 }
@@ -76,13 +74,6 @@ func newConnectionConfig(opts ...ConnectionOption) (*connectionConfig, error) {
 	return cfg, nil
 }
 
-func withServerDescriptionCallback(callback func(description.Server), opts ...ConnectionOption) []ConnectionOption {
-	return append(opts, ConnectionOption(func(c *connectionConfig) error {
-		c.descCallback = callback
-		return nil
-	}))
-}
-
 // ConnectionOption is used to configure a connection.
 type ConnectionOption func(*connectionConfig) error
 

x/mongo/driver/topology/connection_test.go

@@ -103,29 +103,26 @@ func TestConnection(t *testing.T) {
 			})
 			t.Run("calls description callback", func(t *testing.T) {
 				want := description.Server{Addr: address.Address("1.2.3.4:56789")}
-				var got description.Server
 				conn, err := newConnection(address.Address(""),
-					withServerDescriptionCallback(func(desc description.Server) { got = desc },
-						WithHandshaker(func(Handshaker) Handshaker {
-							return &testHandshaker{
-								getDescription: func(context.Context, address.Address, driver.Connection) (description.Server, error) {
-									return want, nil
-								},
-							}
-						}),
-						WithDialer(func(Dialer) Dialer {
-							return DialerFunc(func(context.Context, string, string) (net.Conn, error) {
-								return &net.TCPConn{}, nil
-							})
-						}),
-					)...,
+					WithHandshaker(func(Handshaker) Handshaker {
+						return &testHandshaker{
+							getDescription: func(context.Context, address.Address, driver.Connection) (description.Server, error) {
+								return want, nil
+							},
+						}
+					}),
+					WithDialer(func(Dialer) Dialer {
+						return DialerFunc(func(context.Context, string, string) (net.Conn, error) {
+							return &net.TCPConn{}, nil
+						})
+					}),
 				)
 				noerr(t, err)
 				conn.connect(context.Background())
 				err = conn.wait()
 				noerr(t, err)
-				if !cmp.Equal(got, want) {
-					t.Errorf("Server descriptions do not match. got %v; want %v", got, want)
+				if !cmp.Equal(conn.desc, want) {
+					t.Errorf("Server descriptions do not match. got %v; want %v", conn.desc, want)
 				}
 				connState := atomic.LoadInt32(&conn.connected)
 				assert.Equal(t, connected, connState, "expected connection state %v, got %v", connected, connState)

x/mongo/driver/topology/server.go

@@ -167,7 +167,6 @@ func NewServer(addr address.Address, opts ...ServerOption) (*Server, error) {
 	}
 	s.rttMonitor = newRttMonitor(rttCfg)
 
-	callback := func(desc description.Server) { s.updateDescription(desc) }
 	pc := poolConfig{
 		Address:     addr,
 		MinPoolSize: cfg.minConns,
@@ -176,7 +175,7 @@ func NewServer(addr address.Address, opts ...ServerOption) (*Server, error) {
 		PoolMonitor: cfg.poolMonitor,
 	}
 
-	s.pool, err = newPool(pc, withServerDescriptionCallback(callback, cfg.connectionOpts...)...)
+	s.pool, err = newPool(pc, cfg.connectionOpts...)
 	if err != nil {
 		return nil, err
 	}