Merge branch 'main' into az-migration

Author: sean-breen

api/grpc/mpi/v1/command.pb.go

@@ -16,3 +16,13 @@ containermetrics:
   collection_interval: <duration> # default = 1m
   initial_delay: <duration> # default = 1s
 ```
+
+The available scrapers are:
+
+| Scraper      | Supported OSs                | Description                                            |
+| ------------ | ---------------------------- | ------------------------------------------------------ |
+| [cpu]        | All                          | CPU utilization metrics                                |
+| [memory]     | All                          | Memory utilization metrics                             |
+
+[cpu]: ./internal/scraper/cpuscraper/documentation.md
+[memory]: ./internal/scraper/memoryscraper/documentation.md

api/grpc/mpi/v1/common.pb.go

@@ -116,10 +116,11 @@ func TestCommandService_receiveCallback_configApplyRequest(t *testing.T) {
 		10*time.Millisecond,
 	)
 
+	wg.Wait()
+
 	commandService.configApplyRequestQueueMutex.Lock()
 	defer commandService.configApplyRequestQueueMutex.Unlock()
 	assert.Len(t, commandService.configApplyRequestQueue, 1)
-	wg.Wait()
 }
 
 func TestCommandService_UpdateDataPlaneStatus(t *testing.T) {