hubble/relay: rename struct member from pool to pm to avoid confusion

The name `pool` clashes with the package `pool`. It is not a problem per
se but creates a bit of confusion so rename it to `pm`.

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>

pkg/hubble/relay/observer.go

@@ -248,7 +248,7 @@ func (s *Server) GetFlows(req *observerpb.GetFlowsRequest, stream observerpb.Obs
 		}
 	}()
 
-	peers := s.pool.List()
+	peers := s.pm.List()
 	qlen := s.opts.SortBufferMaxLen // we don't want to buffer too many flows
 	if nqlen := req.GetNumber() * uint64(len(peers)); nqlen > 0 && nqlen < uint64(qlen) {
 		// don't make the queue bigger than necessary as it would be a problem
@@ -266,7 +266,7 @@ func (s *Server) GetFlows(req *observerpb.GetFlowsRequest, stream observerpb.Obs
 			s.log.WithField("address", p.Address.String()).Infof(
 				"No connection to peer %s, skipping", p.Name,
 			)
-			s.pool.ReportOffline(p.Name)
+			s.pm.ReportOffline(p.Name)
 			unavailableNodes = append(unavailableNodes, p.Name)
 			continue
 		}
@@ -342,15 +342,15 @@ func (s *Server) ServerStatus(ctx context.Context, req *observerpb.ServerStatusR
 		}
 	}()
 
-	peers := s.pool.List()
+	peers := s.pm.List()
 	statuses := make(chan *observerpb.ServerStatusResponse, len(peers))
 	for _, p := range peers {
 		p := p
 		if p.Conn == nil {
 			s.log.WithField("address", p.Address.String()).Infof(
 				"No connection to peer %s, skipping", p.Name,
 			)
-			s.pool.ReportOffline(p.Name)
+			s.pm.ReportOffline(p.Name)
 			continue
 		}
 		g.Go(func() error {

pkg/hubble/relay/server.go

@@ -37,7 +37,7 @@ import (
 // via unix domain socket.
 type Server struct {
 	server *grpc.Server
-	pool   pool.PeerManager
+	pm     pool.PeerManager
 	log    logrus.FieldLogger
 	opts   relayoption.Options
 	stop   chan struct{}
@@ -54,7 +54,7 @@ func NewServer(options ...relayoption.Option) (*Server, error) {
 	logger := logging.DefaultLogger.WithField(logfields.LogSubsys, "hubble-relay")
 	logging.ConfigureLogLevel(opts.Debug)
 
-	pool, err := pool.NewManager(
+	pm, err := pool.NewManager(
 		pool.WithPeerServiceAddress(opts.HubbleTarget),
 		pool.WithPeerClientBuilder(
 			&peerTypes.LocalClientBuilder{
@@ -75,7 +75,7 @@ func NewServer(options ...relayoption.Option) (*Server, error) {
 		return nil, err
 	}
 	return &Server{
-		pool: pool,
+		pm:   pm,
 		log:  logger,
 		stop: make(chan struct{}),
 		opts: opts,
@@ -96,7 +96,7 @@ func (s *Server) Serve() error {
 	if err != nil {
 		return fmt.Errorf("failed to listen on tcp socket %s: %v", s.opts.ListenAddress, err)
 	}
-	s.pool.Start()
+	s.pm.Start()
 	reflection.Register(s.server)
 	return s.server.Serve(socket)
 }
@@ -106,6 +106,6 @@ func (s *Server) Stop() {
 	s.log.Info("Stopping server...")
 	close(s.stop)
 	s.server.Stop()
-	s.pool.Stop()
+	s.pm.Stop()
 	s.log.Info("Server stopped")
 }