feat(worker-manager): Adding scanner metrics

lotas · lotas · commit 2c51af235443 · 2022-04-22T16:34:51.000+02:00
diff --git a/services/worker-manager/src/monitor.js b/services/worker-manager/src/monitor.js
@@ -98,12 +98,13 @@ MonitorManager.register({
   name: 'scanSeen',
   title: 'Scan Seen',
   type: 'scan-seen',
-  version: 2,
+  version: 3,
   level: 'notice',
   description: 'The results of a worker-scanner run',
   fields: {
     providerId: 'The provider that has completed this scan',
     seen: 'A map of workerPoolId that were seen to how much capacity was seen',
+    total: 'Total number of workers seen',
   },
 });
 
diff --git a/services/worker-manager/src/providers/aws.js b/services/worker-manager/src/providers/aws.js
@@ -414,7 +414,11 @@ class AwsProvider extends Provider {
   }
 
   async scanCleanup() {
-    this.monitor.log.scanSeen({ providerId: this.providerId, seen: this.seen });
+    this.monitor.log.scanSeen({
+      providerId: this.providerId,
+      seen: this.seen,
+      total: Provider.calcSeenTotal(this.seen),
+    });
   }
 
   /**
diff --git a/services/worker-manager/src/providers/azure/index.js b/services/worker-manager/src/providers/azure/index.js
@@ -1172,7 +1172,11 @@ class AzureProvider extends Provider {
    * Called after an iteration of the worker scanner
    */
   async scanCleanup() {
-    this.monitor.log.scanSeen({ providerId: this.providerId, seen: this.seen });
+    this.monitor.log.scanSeen({
+      providerId: this.providerId,
+      seen: this.seen,
+      total: Provider.calcSeenTotal(this.seen),
+    });
     await Promise.all(Object.entries(this.seen).map(async ([workerPoolId, seen]) => {
       const workerPool = await WorkerPool.get(this.db, workerPoolId);
 
diff --git a/services/worker-manager/src/providers/google.js b/services/worker-manager/src/providers/google.js
@@ -426,7 +426,11 @@ class GoogleProvider extends Provider {
    * Called after an iteration of the worker scanner
    */
   async scanCleanup() {
-    this.monitor.log.scanSeen({ providerId: this.providerId, seen: this.seen });
+    this.monitor.log.scanSeen({
+      providerId: this.providerId,
+      seen: this.seen,
+      total: Provider.calcSeenTotal(this.seen),
+    });
     await Promise.all(Object.entries(this.seen).map(async ([workerPoolId, seen]) => {
       const workerPool = await WorkerPool.get(this.db, workerPoolId);
       if (!workerPool) {
diff --git a/services/worker-manager/src/providers/provider.js b/services/worker-manager/src/providers/provider.js
@@ -169,6 +169,9 @@ class Provider {
     });
   }
 
+  static calcSeenTotal(seen = {}) {
+    return Object.values(seen).reduce((sum, seen) => sum + seen, 0);
+  }
 }
 
 /**
diff --git a/services/worker-manager/test/provider_test.js b/services/worker-manager/test/provider_test.js
@@ -176,5 +176,18 @@ helper.secrets.mockSuite(testing.suiteName(), [], function(mock, skipping) {
         Severity: LEVELS.notice,
       });
     });
+
+    test('calc seen total', () => {
+      assert.equal(0, Provider.calcSeenTotal());
+      assert.equal(1, Provider.calcSeenTotal({
+        'gecko-t/cpu': 1,
+      }));
+      assert.equal(55, Provider.calcSeenTotal({
+        'gecko-t/win95-sp2': 33,
+        'gecko-t/win98-x64': 20,
+        'gecko-t/win7-gpu': 1,
+        'gecko-t/win7-x64': 1,
+      }));
+    });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,11 @@ class AwsProvider extends Provider {`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`async scanCleanup() {`
`417`		`- this.monitor.log.scanSeen({ providerId: this.providerId, seen: this.seen });`
	`417`	`+ this.monitor.log.scanSeen({`
	`418`	`+ providerId: this.providerId,`
	`419`	`+ seen: this.seen,`
	`420`	`+ total: Provider.calcSeenTotal(this.seen),`
	`421`	`+ });`
`418`	`422`	`}`
`419`	`423`
`420`	`424`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,9 @@ class Provider {`
`169`	`169`	`});`
`170`	`170`	`}`
`171`	`171`
	`172`	`+ static calcSeenTotal(seen = {}) {`
	`173`	`+ return Object.values(seen).reduce((sum, seen) => sum + seen, 0);`
	`174`	`+ }`
`172`	`175`	`}`
`173`	`176`
`174`	`177`	`/**`