Tests passing

Author: tbantle22

server/connection_handler.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqlserver"
+	"github.com/dolthub/go-mysql-server/server"
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/vitess/go/mysql"
 	"github.com/dolthub/vitess/go/vt/sqlparser"
@@ -87,7 +88,7 @@ func init() {
 }
 
 // NewConnectionHandler returns a new ConnectionHandler for the connection provided
-func NewConnectionHandler(conn net.Conn, handler mysql.Handler) *ConnectionHandler {
+func NewConnectionHandler(conn net.Conn, handler mysql.Handler, sel server.ServerEventListener) *ConnectionHandler {
 	mysqlConn := &mysql.Conn{
 		Conn:        conn,
 		PrepareData: make(map[uint32]*mysql.PrepareData),
@@ -111,9 +112,9 @@ func NewConnectionHandler(conn net.Conn, handler mysql.Handler) *ConnectionHandl
 		encodeLoggedQuery: false, // cfg.EncodeLoggedQuery,
 		pgTypeMap:         pgtype.NewMap(),
 	}
-	// if csqlserver.MetricsListener != nil {
-	// 	doltgresHandler.sel = csqlserver.MetricsListener
-	// }
+	if sel != nil {
+		doltgresHandler.sel = sel
+	}
 
 	return &ConnectionHandler{
 		mysqlConn:          mysqlConn,

server/listener.go

@@ -35,6 +35,7 @@ var (
 type Listener struct {
 	listener net.Listener
 	cfg      mysql.ListenerConfig
+	sel      server.ServerEventListener
 }
 
 var _ server.ProtocolListener = (*Listener)(nil)
@@ -48,14 +49,15 @@ func WithCertificate(cert tls.Certificate) ListenerOpt {
 }
 
 // NewListener creates a new Listener.
-func NewListener(listenerCfg mysql.ListenerConfig) (server.ProtocolListener, error) {
-	return NewListenerWithOpts(listenerCfg)
+func NewListener(listenerCfg mysql.ListenerConfig, sel server.ServerEventListener) (server.ProtocolListener, error) {
+	return NewListenerWithOpts(listenerCfg, sel)
 }
 
-func NewListenerWithOpts(listenerCfg mysql.ListenerConfig, opts ...ListenerOpt) (server.ProtocolListener, error) {
+func NewListenerWithOpts(listenerCfg mysql.ListenerConfig, sel server.ServerEventListener, opts ...ListenerOpt) (server.ProtocolListener, error) {
 	l := &Listener{
 		listener: listenerCfg.Listener,
 		cfg:      listenerCfg,
+		sel:      sel,
 	}
 
 	for _, opt := range opts {
@@ -83,7 +85,7 @@ func (l *Listener) Accept() {
 			conn = netutil.NewConnWithTimeouts(conn, l.cfg.ConnReadTimeout, l.cfg.ConnWriteTimeout)
 		}
 
-		connectionHandler := NewConnectionHandler(conn, l.cfg.Handler)
+		connectionHandler := NewConnectionHandler(conn, l.cfg.Handler, l.sel)
 		go connectionHandler.HandleConnection()
 	}
 }

testing/go/ssl_test.go

@@ -23,7 +23,7 @@ type SSLListener struct {
 	*dserver.Listener
 }
 
-func NewSslListener(listenerCfg mysql.ListenerConfig) (server.ProtocolListener, error) {
+func NewSslListener(listenerCfg mysql.ListenerConfig, sel server.ServerEventListener) (server.ProtocolListener, error) {
 	// Since this is intended for testing, we'll configure a test certificate so that we can test for SSL support
 	cert, key, err := testcerts.GenerateCerts()
 	if err != nil {
@@ -35,7 +35,7 @@ func NewSslListener(listenerCfg mysql.ListenerConfig) (server.ProtocolListener,
 		panic(err)
 	}
 
-	listener, err := dserver.NewListenerWithOpts(listenerCfg, dserver.WithCertificate(certificate))
+	listener, err := dserver.NewListenerWithOpts(listenerCfg, sel, dserver.WithCertificate(certificate))
 	if err != nil {
 		return nil, err
 	}