Merge pull request #5299 from taskcluster/feature/4999-azure-workers-registration-issue

matt-boris · web-flow · commit 7b7a4d67927f · 2022-03-17T13:55:44.000-04:00
feat(worker-manager): Azure provider logs extra information
diff --git a/changelog/issue-4999.md b/changelog/issue-4999.md
@@ -0,0 +1,4 @@
+audience: general
+level: silent
+reference: issue 4999
+---
diff --git a/generated/references.json b/generated/references.json
diff --git a/services/worker-manager/src/monitor.js b/services/worker-manager/src/monitor.js
@@ -25,6 +25,7 @@ MonitorManager.register({
     providerId: 'The provider that did the work for this worker pool.',
     workerGroup: 'The worker group for this worker',
     workerId: 'The worker that was created',
+    terminateAfter: 'Time after which worker should be terminated',
   },
 });
 
diff --git a/services/worker-manager/src/providers/aws.js b/services/worker-manager/src/providers/aws.js
@@ -228,6 +228,7 @@ class AwsProvider extends Provider {
           providerId: this.providerId,
           workerGroup: config.region,
           workerId: i.InstanceId,
+          terminateAfter,
         });
         const worker = Worker.fromApi({
           workerPoolId,
diff --git a/services/worker-manager/src/providers/azure/index.js b/services/worker-manager/src/providers/azure/index.js
@@ -415,6 +415,7 @@ class AzureProvider extends Provider {
         providerId: this.providerId,
         workerGroup,
         workerId: virtualMachineName,
+        terminateAfter,
       });
       const worker = Worker.fromApi({
         workerPoolId,
diff --git a/services/worker-manager/src/providers/google.js b/services/worker-manager/src/providers/google.js
@@ -313,6 +313,7 @@ class GoogleProvider extends Provider {
         providerId: this.providerId,
         workerGroup,
         workerId: op.targetId,
+        terminateAfter,
       });
       const worker = Worker.fromApi({
         workerPoolId,
