From de0cb1af7fe1188aac5fec554a312546be3e25fe Mon Sep 17 00:00:00 2001 From: freddygv Date: Fri, 5 Feb 2021 15:15:52 -0700 Subject: [PATCH] Make xDS labeling consistent with proxycfg --- agent/xds/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/xds/server.go b/agent/xds/server.go index b2506a753c..7986b80150 100644 --- a/agent/xds/server.go +++ b/agent/xds/server.go @@ -328,7 +328,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest) defer watchCancel() logger.Trace("watching proxy, pending initial proxycfg snapshot", - "proxy-id", proxyID.String()) + "service_id", proxyID.String()) // Now wait for the config so we can check ACL state = statePendingInitialConfig @@ -342,7 +342,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest) state = stateRunning logger.Trace("Got initial config snapshot", - "proxy-id", cfgSnap.ProxyID.String()) + "service_id", cfgSnap.ProxyID.String()) // Lets actually process the config we just got or we'll mis responding fallthrough @@ -356,7 +356,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest) extendAuthTimer() logger.Trace("Invoking all xDS resource handlers and sending new data if there is any", - "proxy-id", cfgSnap.ProxyID.String()) + "service_id", cfgSnap.ProxyID.String()) // See if any handlers need to have the current (possibly new) config // sent. Note the order here is actually significant so we can't just