Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass metrics server listener to DefaultProtocolListenerFunc for doltgres metrics #2800

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Pass metrics server listener to DefaultProtocolListenerFunc for doltgres metrics #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ func Intercept(h Interceptor) {
func WithChain() Option {
return func(e *sqle.Engine, sm *SessionManager, handler mysql.Handler) {
f := DefaultProtocolListenerFunc
DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {
DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {
cfg.Handler = buildChain(cfg.Handler)
return f(cfg)
return f(cfg, sel)
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ type ProtocolListener interface {
}

// ProtocolListenerFunc returns a ProtocolListener based on the configuration it was given.
type ProtocolListenerFunc func(cfg mysql.ListenerConfig) (ProtocolListener, error)
type ProtocolListenerFunc func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error)

// DefaultProtocolListenerFunc is the protocol listener, which defaults to Vitess' protocol listener. Changing
// this function will change the protocol listener used when creating all servers. If multiple servers are needed
// with different protocols, then create each server after changing this function. Servers retain the protocol that
// they were created with.
var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {
var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {
return mysql.NewListenerWithConfig(cfg)
}

Expand Down Expand Up @@ -75,7 +75,7 @@ func NewServer(cfg Config, e *sqle.Engine, sb SessionBuilder, listener ServerEve
sel: listener,
}
//handler = NewHandler_(e, sm, cfg.ConnReadTimeout, cfg.DisableClientMultiStatements, cfg.MaxLoggedQueryLen, cfg.EncodeLoggedQuery, listener)
return newServerFromHandler(cfg, e, sm, handler)
return newServerFromHandler(cfg, e, sm, handler, listener)
}

// HandlerWrapper provides a way for clients to wrap the mysql.Handler used by the server with a custom implementation
Expand Down Expand Up @@ -113,7 +113,7 @@ func NewServerWithHandler(
return nil, err
}

return newServerFromHandler(cfg, e, sm, handler)
return newServerFromHandler(cfg, e, sm, handler, listener)
}

func portInUse(hostPort string) bool {
Expand All @@ -126,7 +126,7 @@ func portInUse(hostPort string) bool {
return false
}

func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handler mysql.Handler) (*Server, error) {
func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handler mysql.Handler, sel ServerEventListener) (*Server, error) {
for _, option := range cfg.Options {
option(e, sm, handler)
}
Expand Down Expand Up @@ -169,7 +169,7 @@ func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handle
ConnReadBufferSize: mysql.DefaultConnBufferSize,
AllowClearTextWithoutTLS: cfg.AllowClearTextWithoutTLS,
}
protocolListener, err := DefaultProtocolListenerFunc(listenerCfg)
protocolListener, err := DefaultProtocolListenerFunc(listenerCfg, sel)
if err != nil {
return nil, err
}
Expand Down
Loading