fixing vet

Author: mbissa

internal/xds/clients/config.go

@@ -112,10 +112,9 @@ type MetricsReporter interface {
 
 	// RegisterAsyncReporter registers a reporter to produce metric values for
 	// the set of metrics supported by the client. See the metrics sub-package
-	// for the specific client 
-	// (e.g. internal/xds/clients/xdsclient/metrics/metrics.go) for the list of
-	// supported metrics. The returned function must be called when the metrics
-	// are no longer needed, which will remove the reporter.
+	// for the specific client (e.g. internal/xds/clients/xdsclient/metrics/metrics.go)
+	// for the list of supported metrics. The returned function must be called
+	// when the metrics are no longer needed, which will remove the reporter.
 	//
 	// Once the returned cancel function is called, the Report method on the
 	// registered reporter is guaranteed not to be called again.

internal/xds/clients/xdsclient/ads_stream.go

@@ -721,9 +721,8 @@ func (fc *adsFlowControl) wait() bool {
 	return fc.stopped
 }
 
-
 func (s *adsStreamImpl) isStreamEstablished() bool {
-s.mu.Lock()
-defer s.mu.Unlock()
-return s.streamEstablished
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.streamEstablished
 }

internal/xds/clients/xdsclient/xdsclient.go

@@ -484,13 +484,13 @@ func (c *XDSClient) reportConnectedState(rec clients.AsyncMetricsRecorder) {
 
 // reportResourceStats handles the "grpc.xds_client.resources" metric.
 func (c *XDSClient) reportResourceStats(rec clients.AsyncMetricsRecorder) {
-	reportForAuthority := func(a *authority) {
-		stats := a.resourceStats()
+	reportForAuthority := func(auth *authority) {
+		stats := auth.resourceStats()
 		for typeURL, stateCounts := range stats {
 			for cacheState, count := range stateCounts {
 				if count > 0 {
 					rec.ReportMetric(&metrics.XDSClientResourceStats{
-						Authority:    a.name,
+						Authority:    auth.name,
 						ResourceType: typeURL,
 						CacheState:   cacheState,
 						Count:        int64(count),
@@ -499,12 +499,11 @@ func (c *XDSClient) reportResourceStats(rec clients.AsyncMetricsRecorder) {
 			}
 		}
 	}
-
 	if c.topLevelAuthority != nil {
 		reportForAuthority(c.topLevelAuthority)
 	}
-	for _, a := range c.authorities {
-		reportForAuthority(a)
+	for _, auth := range c.authorities {
+		reportForAuthority(auth)
 	}
 }