xdsclient: indicate authority serverURI in authority + transport logs (…

…#6425)

xds/internal/xdsclient/clientimpl_authority.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 
+	"google.golang.org/grpc/internal/grpclog"
 	"google.golang.org/grpc/xds/internal/xdsclient/bootstrap"
 	"google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
 )
@@ -109,7 +110,7 @@ func (c *clientImpl) newAuthorityLocked(config *bootstrap.ServerConfig) (_ *auth
 		serializer:         c.serializer,
 		resourceTypeGetter: c.resourceTypes.get,
 		watchExpiryTimeout: c.watchExpiryTimeout,
-		logger:             c.logger,
+		logger:             grpclog.NewPrefixLogger(logger, authorityPrefix(c, config.ServerURI)),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("creating new authority for config %q: %v", config.String(), err)

xds/internal/xdsclient/logging.go

@@ -25,10 +25,16 @@ import (
 	internalgrpclog "google.golang.org/grpc/internal/grpclog"
 )
 
-const prefix = "[xds-client %p] "
-
 var logger = grpclog.Component("xds")
 
 func prefixLogger(p *clientImpl) *internalgrpclog.PrefixLogger {
-	return internalgrpclog.NewPrefixLogger(logger, fmt.Sprintf(prefix, p))
+	return internalgrpclog.NewPrefixLogger(logger, clientPrefix(p))
+}
+
+func clientPrefix(p *clientImpl) string {
+	return fmt.Sprintf("[xds-client %p] ", p)
+}
+
+func authorityPrefix(p *clientImpl, serverURI string) string {
+	return fmt.Sprintf("%s[%s] ", clientPrefix(p), serverURI)
 }