diff --git a/agent/agent.go b/agent/agent.go index dab7d542c0dce..b59799be606cf 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -925,6 +925,7 @@ func (a *Agent) Failed() <-chan struct{} { // the PRoxyWatcher interface and registers the XDS server with Consul's // external facing GRPC server. func (a *Agent) configureXDSServer(proxyWatcher xds.ProxyWatcher, server *consul.Server) { + a.logger.Debug("configureXDSServer", "proxyWatcher", proxyWatcher, "server", server) // TODO(agentless): rather than asserting the concrete type of delegate, we // should add a method to the Delegate interface to build a ConfigSource. if server != nil { @@ -964,6 +965,7 @@ func (a *Agent) configureXDSServer(proxyWatcher xds.ProxyWatcher, server *consul } func (a *Agent) listenAndServeGRPC(proxyTracker *proxytracker.ProxyTracker, server *consul.Server) error { + a.logger.Debug("listenAndServeGRPC", "proxyTracker", proxyTracker, "server", server) if len(a.config.GRPCAddrs) < 1 && len(a.config.GRPCTLSAddrs) < 1 { return nil } @@ -4570,6 +4572,7 @@ func (a *Agent) listenerPortLocked(svcID structs.ServiceID, checkID structs.Chec } func (a *Agent) proxyDataSources(server *consul.Server) proxycfg.DataSources { + a.logger.Debug("proxyDataSources", "server", server) sources := proxycfg.DataSources{ CARoots: proxycfgglue.CacheCARoots(a.cache), CompiledDiscoveryChain: proxycfgglue.CacheCompiledDiscoveryChain(a.cache), diff --git a/agent/consul/server.go b/agent/consul/server.go index 73a26bd805c46..0de402ae746f6 100644 --- a/agent/consul/server.go +++ b/agent/consul/server.go @@ -505,6 +505,9 @@ type ProxyUpdater interface { func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server, incomingRPCLimiter rpcRate.RequestLimitsHandler, serverLogger hclog.InterceptLogger, proxyUpdater ProxyUpdater) (*Server, error) { logger := flat.Logger + logger.Debug("NewServer", "config", config, "flat", flat, "externalGRPCServer", externalGRPCServer, + "incomingRPCLimiter", incomingRPCLimiter, "serverLogger", serverLogger, "proxyUpdater", proxyUpdater) + if err := config.CheckProtocolVersion(); err != nil { return nil, err }