Fix potential goroutine leaks

agent/acs/client/acs_client_test.go

@@ -347,9 +347,9 @@ func testCS(conn *mock_wsconn.MockWebsocketConn) wsclient.ClientServer {
 
 // TODO: replace with gomock
 func startMockAcsServer(t *testing.T, closeWS <-chan bool) (*httptest.Server, chan<- string, <-chan string, <-chan error, error) {
-	serverChan := make(chan string)
-	requestsChan := make(chan string)
-	errChan := make(chan error)
+	serverChan := make(chan string, 1)
+	requestsChan := make(chan string, 1)
+	errChan := make(chan error, 1)
 
 	upgrader := websocket.Upgrader{ReadBufferSize: 1024, WriteBufferSize: 1024}
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

agent/acs/handler/acs_handler.go

@@ -196,12 +196,10 @@ func NewSession(
 func (acsSession *session) Start() error {
 	// connectToACS channel is used to indicate the intent to connect to ACS
 	// It's processed by the select loop to connect to ACS
-	connectToACS := make(chan struct{})
+	connectToACS := make(chan struct{}, 1)
 	// This is required to trigger the first connection to ACS. Subsequent
 	// connections are triggered by the handleACSError() method
-	go func() {
-		connectToACS <- struct{}{}
-	}()
+	connectToACS <- struct{}{}
 	for {
 		select {
 		case <-connectToACS:

agent/tcs/handler/handler.go

@@ -143,7 +143,7 @@ func startSession(
 	client.AddRequestHandler(ackPublishHealthMetricHandler(timer))
 	client.AddRequestHandler(ackPublishInstanceStatusHandler(timer))
 	client.SetAnyRequestHandler(anyMessageHandler(client))
-	serveC := make(chan error)
+	serveC := make(chan error, 1)
 	go func() {
 		serveC <- client.Serve()
 	}()