NBS-2007: send 0 for no async results (#14)

* NBS-2007: send 0 for no async results

* NBS-2007 fix: move the lock up

* list of types

* fix: improvement

* test: update

Author: MCBrandenburg

pkg/prom/collector.go

@@ -1304,9 +1304,15 @@ func (c *SolidfireCollector) collectAsyncResults(ctx context.Context, ch chan<-
 		}
 	}
 
+	types := []string{"DriveAdd", "BulkVolume", "Clone", "DriveRemoval", "RtfiPendingNode"}
+	for _, t := range types {
+		if _, ok := m[t]; !ok {
+			m[t] = 0
+		}
+	}
+
 	mu.Lock()
 	defer mu.Unlock()
-
 	for k, v := range m {
 		ch <- prometheus.MustNewConstMetric(
 			MetricDescriptions.AsyncResultsActive,

pkg/testutils/collector.go

@@ -79,7 +79,12 @@ solidfire_cluster_used_metadata_space_bytes 7.221248e+06
 solidfire_cluster_used_metadata_space_in_snapshots_bytes 7.221248e+06
 solidfire_cluster_used_space_bytes 3.47282402e+08
 solidfire_cluster_volume_access_group_count 1
+solidfire_cluster_volume_async_result_active{type="BulkVolume"} 0
+solidfire_cluster_volume_async_result_active{type="Clone"} 0
+solidfire_cluster_volume_async_result_active{type="DriveAdd"} 0
+solidfire_cluster_volume_async_result_active{type="DriveRemoval"} 0
 solidfire_cluster_volume_async_result_active{type="NotClone"} 1
+solidfire_cluster_volume_async_result_active{type="RtfiPendingNode"} 0
 solidfire_cluster_volume_bulk_volume_job_count 1
 solidfire_cluster_write_bytes_total 1.21720639488e+11
 solidfire_cluster_write_latency_seconds 0
@@ -358,7 +363,12 @@ solidfire_cluster_used_metadata_space_bytes 7.221248e+06
 solidfire_cluster_used_metadata_space_in_snapshots_bytes 7.221248e+06
 solidfire_cluster_used_space_bytes 3.47282402e+08
 solidfire_cluster_volume_access_group_count 1
+solidfire_cluster_volume_async_result_active{type="BulkVolume"} 0
+solidfire_cluster_volume_async_result_active{type="Clone"} 0
+solidfire_cluster_volume_async_result_active{type="DriveAdd"} 0
+solidfire_cluster_volume_async_result_active{type="DriveRemoval"} 0
 solidfire_cluster_volume_async_result_active{type="NotClone"} 1
+solidfire_cluster_volume_async_result_active{type="RtfiPendingNode"} 0
 solidfire_cluster_volume_bulk_volume_job_count 1
 solidfire_cluster_write_bytes_total 1.21720639488e+11
 solidfire_cluster_write_latency_seconds 0