Make event.CommandMetadata private

GODRIVER-683

Change-Id: Ib6c60388cc76aee5b638aa99b5f0274c9b7b99ef

Author: skriptble

event/monitoring.go

@@ -8,32 +8,10 @@ package event
 
 import (
 	"context"
-	"time"
 
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
-// CommandMetadata contains metadata about a command sent to the server.
-type CommandMetadata struct {
-	Name string
-	Time time.Time
-}
-
-// CreateMetadata creates metadata for a command.
-func CreateMetadata(name string) *CommandMetadata {
-	return &CommandMetadata{
-		Name: name,
-		Time: time.Now(),
-	}
-}
-
-// TimeDifference returns the difference between now and the time a command was sent in nanoseconds.
-func (cm *CommandMetadata) TimeDifference() int64 {
-	t := time.Now()
-	duration := t.Sub(cm.Time)
-	return duration.Nanoseconds()
-}
-
 // CommandStartedEvent represents an event generated when a command is sent to a server.
 type CommandStartedEvent struct {
 	Command      bsonx.Doc

x/network/connection/command_metadata.go

@@ -0,0 +1,24 @@
+package connection
+
+import "time"
+
+// commandMetadata contains metadata about a command sent to the server.
+type commandMetadata struct {
+	Name string
+	Time time.Time
+}
+
+// createMetadata creates metadata for a command.
+func createMetadata(name string) *commandMetadata {
+	return &commandMetadata{
+		Name: name,
+		Time: time.Now(),
+	}
+}
+
+// TimeDifference returns the difference between now and the time a command was sent in nanoseconds.
+func (cm *commandMetadata) TimeDifference() int64 {
+	t := time.Now()
+	duration := t.Sub(cm.Time)
+	return duration.Nanoseconds()
+}

x/network/connection/connection.go

@@ -93,7 +93,7 @@ type connection struct {
 	compressor  compressor.Compressor // use for compressing messages
 	// server can compress response with any compressor supported by driver
 	compressorMap    map[wiremessage.CompressorID]compressor.Compressor
-	commandMap       map[int64]*event.CommandMetadata // map for monitoring commands sent to server
+	commandMap       map[int64]*commandMetadata // map for monitoring commands sent to server
 	dead             bool
 	idleTimeout      time.Duration
 	idleDeadline     time.Time
@@ -146,7 +146,7 @@ func New(ctx context.Context, addr address.Address, opts ...Option) (Connection,
 		conn:             nc,
 		compressBuf:      make([]byte, 256),
 		compressorMap:    compressorMap,
-		commandMap:       make(map[int64]*event.CommandMetadata),
+		commandMap:       make(map[int64]*commandMetadata),
 		addr:             addr,
 		idleTimeout:      cfg.idleTimeout,
 		lifetimeDeadline: lifetimeDeadline,
@@ -441,7 +441,7 @@ func (c *connection) commandStartedEvent(ctx context.Context, wm wiremessage.Wir
 		return nil
 	}
 
-	c.commandMap[startedEvent.RequestID] = event.CreateMetadata(startedEvent.CommandName)
+	c.commandMap[startedEvent.RequestID] = createMetadata(startedEvent.CommandName)
 	return nil
 }