[Flaky Test] Fix TestMakeReporter and TestHTTP test

libbeat/api/server.go

@@ -23,6 +23,7 @@
 	"net/http"
 	"net/url"
 	"strconv"
+	"sync"
 
 	"github.com/gorilla/mux"
 
@@ -37,6 +38,7 @@
 	mux    *mux.Router
 	l      net.Listener
 	config Config
+	wg     sync.WaitGroup
 }
 
 // New creates a new API Server with no routes attached.
@@ -63,16 +65,23 @@
 // Start starts the HTTP server and accepting new connection.
 func (s *Server) Start() {
 	s.log.Info("Starting stats endpoint")
+	s.wg.Add(1)
 	go func(l net.Listener) {
+		defer s.wg.Done()
 		s.log.Infof("Metrics endpoint listening on: %s (configured: %s)", l.Addr().String(), s.config.Host)
 		err := http.Serve(l, s.mux)
 		s.log.Infof("Stats endpoint (%s) finished: %v", l.Addr().String(), err)
 	}(s.l)
 }
 
 // Stop stops the API server and free any resource associated with the process like unix sockets.
 func (s *Server) Stop() error {
-	return s.l.Close()
+	err := s.l.Close()
+	if err != nil {
+		return fmt.Errorf("error stopping monitoring server: %w", err)
+	}
+	s.wg.Wait()
+	return nil
 }
 
 // AttachHandler will attach a handler at the specified route. Routes are

libbeat/monitoring/report/elasticsearch/elasticsearch.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"math/rand/v2"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/elastic/beats/v7/libbeat/beat"
@@ -55,6 +56,7 @@ type reporter struct {
 	client   beat.Client
 
 	out []outputs.NetworkClient
+	wg  sync.WaitGroup
 }
 
 const logSelector = "monitoring"
@@ -195,6 +197,7 @@ func makeReporter(beat beat.Info, mon beat.Monitoring, settings report.Settings,
 		client:     pipeConn,
 		out:        clients,
 	}
+	r.wg.Add(1)
 	go r.initLoop(config)
 	return r, nil
 }
@@ -203,11 +206,15 @@ func (r *reporter) Stop() {
 	r.done.Stop()
 	r.client.Close()
 	r.pipeline.Close()
+	r.wg.Wait()
 }
 
 func (r *reporter) initLoop(c config) {
 	r.logger.Debug("Start monitoring endpoint init loop.")
-	defer r.logger.Debug("Finish monitoring endpoint init loop.")
+	defer func() {
+		r.logger.Debug("Finish monitoring endpoint init loop.")
+		r.wg.Done()
+	}()
 
 	log := r.logger