GODRIVER-1405 set appname on ServerConfig (#226)

Author: iwysiu

x/mongo/driver/examples/server_monitoring/main.go

@@ -22,7 +22,7 @@ func main() {
 		topology.WithHeartbeatInterval(func(time.Duration) time.Duration { return 2 * time.Second }),
 		topology.WithConnectionOptions(
 			func(opts ...topology.ConnectionOption) []topology.ConnectionOption {
-				return append(opts, topology.WithAppName(func(string) string { return "server monitoring test" }))
+				return append(opts, topology.WithConnectionAppName(func(string) string { return "server monitoring test" }))
 			},
 		),
 	)

x/mongo/driver/topology/connection_options.go

@@ -84,9 +84,9 @@ func withServerDescriptionCallback(callback func(description.Server), opts ...Co
 // ConnectionOption is used to configure a connection.
 type ConnectionOption func(*connectionConfig) error
 
-// WithAppName sets the application name which gets sent to MongoDB when it
+// WithConnectionAppName sets the application name which gets sent to MongoDB when it
 // first connects.
-func WithAppName(fn func(string) string) ConnectionOption {
+func WithConnectionAppName(fn func(string) string) ConnectionOption {
 	return func(c *connectionConfig) error {
 		c.appName = fn(c.appName)
 		return nil

x/mongo/driver/topology/server_options.go

@@ -68,6 +68,14 @@ func WithCompressionOptions(fn func(...string) []string) ServerOption {
 	}
 }
 
+// WithServerAppName configures the server's application name.
+func WithServerAppName(fn func(string) string) ServerOption {
+	return func(cfg *serverConfig) error {
+		cfg.appname = fn(cfg.appname)
+		return nil
+	}
+}
+
 // WithHeartbeatInterval configures a server's heartbeat interval.
 func WithHeartbeatInterval(fn func(time.Duration) time.Duration) ServerOption {
 	return func(cfg *serverConfig) error {

x/mongo/driver/topology/server_test.go

@@ -290,6 +290,14 @@ func TestServer(t *testing.T) {
 			t.Fatal("client metadata not expected in heartbeat but found")
 		}
 	})
+	t.Run("WithServerAppName", func(t *testing.T) {
+		name := "test"
+
+		s, err := NewServer(address.Address("localhost"),
+			WithServerAppName(func(string) string { return name }))
+		require.Nil(t, err, "error from NewServer: %v", err)
+		require.Equal(t, name, s.cfg.appname, "expected appname to be: %v, got: %v", name, s.cfg.appname)
+	})
 }
 
 func includesMetadata(t *testing.T, wm []byte) bool {

x/mongo/driver/topology/topology_options.go

@@ -64,7 +64,8 @@ func WithConnString(fn func(connstring.ConnString) connstring.ConnString) Option
 		var connOpts []ConnectionOption
 
 		if cs.AppName != "" {
-			connOpts = append(connOpts, WithAppName(func(string) string { return cs.AppName }))
+			connOpts = append(connOpts, WithConnectionAppName(func(string) string { return cs.AppName }))
+			c.serverOpts = append(c.serverOpts, WithServerAppName(func(string) string { return cs.AppName }))
 		}
 
 		switch cs.Connect {

x/mongo/driver/topology/topology_options_test.go

@@ -17,17 +17,23 @@ import (
 func TestOptionsSetting(t *testing.T) {
 	conf := &config{}
 	ssts := time.Minute
+	name := "test"
 	assert.Zero(t, conf.cs)
 
 	opt := WithConnString(func(connstring.ConnString) connstring.ConnString {
 		return connstring.ConnString{
 			ServerSelectionTimeout:    ssts,
 			ServerSelectionTimeoutSet: true,
+			AppName:                   name,
 		}
 
 	})
 
 	assert.NoError(t, opt(conf))
 
 	assert.Equal(t, ssts, conf.serverSelectionTimeout)
+
+	serverConf, err := newServerConfig(conf.serverOpts...)
+	assert.Nil(t, err, "error from newServerConfig: %v", err)
+	assert.Equal(t, name, serverConf.appname, "expected appname to be: %v, got: %v", name, serverConf.appname)
 }