BB-721: Use real lifecycle locations for object task metrics.

Resolve delete and restored-object expiration metrics from object metadata so restored objects report their cold location.

Issue: BB-721

Author: benzekrimaha

extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js

@@ -5,6 +5,7 @@ const { HeadObjectCommand, AbortMultipartUploadCommand, DeleteObjectCommand } =
 
 const BackbeatTask = require('../../../lib/tasks/BackbeatTask');
 const { LifecycleMetrics } = require('../LifecycleMetrics');
+const { resolveLifecycleMetricObjectLocation } = require('../util/lifecycleLocation');
 const { 
     DeleteObjectFromExpirationCommand,
     attachReqUids,
@@ -195,7 +196,10 @@ class LifecycleDeleteObjectTask extends BackbeatTask {
 
         const actionType = entry.getActionType();
         const transitionTime = entry.getAttribute('transitionTime');
-        const location = this.objectMD?.dataStoreName || entry.getAttribute('details.dataStoreName');
+        const location = resolveLifecycleMetricObjectLocation(
+            this.objectMD,
+            entry.getAttribute('details.dataStoreName')
+        );
 
         let reqMethod = 'deleteObject';
         let actionMethod = this._deleteObject.bind(this);

tests/unit/lifecycle/LifecycleDeleteObjectTask.spec.js

@@ -7,6 +7,7 @@ const { ObjectMD } = require('arsenal').models;
 const ActionQueueEntry = require('../../../lib/models/ActionQueueEntry');
 const LifecycleDeleteObjectTask = require(
     '../../../extensions/lifecycle/tasks/LifecycleDeleteObjectTask');
+const { LifecycleMetrics } = require('../../../extensions/lifecycle/LifecycleMetrics');
 
 const day = 1000 * 60 * 60 * 24;
 
@@ -51,6 +52,7 @@ describe('LifecycleDeleteObjectTask', () => {
     });
 
     afterEach(() => {
+        sinon.restore();
         backbeatMdProxyClient.setError(null);
     });
 
@@ -279,6 +281,40 @@ describe('LifecycleDeleteObjectTask', () => {
         });
     });
 
+    it('should emit expiration metrics with restored object cold location', done => {
+        const requestedAt = new Date(Date.now() - (2 * day)).toISOString();
+        const completedAt = new Date(Date.now() - day).toISOString();
+        const expireAt = new Date(Date.now() + day).toISOString();
+        objMd.setDataStoreName('STANDARD')
+            .setAmzStorageClass('cold-location')
+            .setArchive({
+                archiveInfo: {
+                    archiveId: 'archive-id',
+                },
+                restoreRequestedAt: requestedAt,
+                restoreRequestedDays: 1,
+                restoreCompletedAt: completedAt,
+                restoreWillExpireAt: expireAt,
+            });
+        const startedMetric = sinon.stub(LifecycleMetrics, 'onLifecycleStarted');
+        const completedMetric = sinon.stub(LifecycleMetrics, 'onLifecycleCompleted');
+        const entry = ActionQueueEntry.create('deleteObject')
+            .setAttribute('target.owner', 'testowner')
+            .setAttribute('target.bucket', 'testbucket')
+            .setAttribute('target.accountId', 'testid')
+            .setAttribute('target.key', 'testkey')
+            .setAttribute('target.version', 'testversion')
+            .setAttribute('details.dataStoreName', 'STANDARD')
+            .setAttribute('transitionTime', Date.now() - day);
+        backbeatClient.setResponse(null, {});
+        task.processActionEntry(entry, err => {
+            assert.ifError(err);
+            assert.strictEqual(startedMetric.firstCall.args[2], 'cold-location');
+            assert.strictEqual(completedMetric.firstCall.args[2], 'cold-location');
+            done();
+        });
+    });
+
     it('should fallback to deleteObject method if deleteObjectFromExpiration is not supported', done => {
         const entry = ActionQueueEntry.create('deleteObject')
             .setAttribute('target.owner', 'testowner')

tests/unit/lifecycle/LifecycleUpdateExpirationTask.spec.js

@@ -1,10 +1,12 @@
 const assert = require('assert');
+const sinon = require('sinon');
 const werelogs = require('werelogs');
 
 const { ObjectMD } = require('arsenal').models;
 const ActionQueueEntry = require('../../../lib/models/ActionQueueEntry');
 const LifecycleUpdateExpirationTask = require(
     '../../../extensions/lifecycle/tasks/LifecycleUpdateExpirationTask');
+const { LifecycleMetrics } = require('../../../extensions/lifecycle/LifecycleMetrics');
 
 const {
     GarbageCollectorProducerMock,
@@ -60,7 +62,13 @@ describe('LifecycleUpdateExpirationTask', () => {
         task = new LifecycleUpdateExpirationTask(objectProcessor);
     });
 
+    afterEach(() => {
+        sinon.restore();
+    });
+
     it('should expire restored object', done => {
+        const startedMetric = sinon.stub(LifecycleMetrics, 'onLifecycleStarted');
+        const completedMetric = sinon.stub(LifecycleMetrics, 'onLifecycleCompleted');
         const requestedAt = new Date();
         const restoreCompletedAt = new Date();
         const expireDate = new Date();
@@ -94,6 +102,8 @@ describe('LifecycleUpdateExpirationTask', () => {
             const receivedGcEntry = gcProducer.getReceivedEntry();
             assert.strictEqual(receivedGcEntry.getActionType(), 'deleteData');
             assert.deepStrictEqual(receivedGcEntry.getAttribute('target.locations'), oldLocation);
+            assert.strictEqual(startedMetric.firstCall.args[2], 'location-dmf-v1');
+            assert.strictEqual(completedMetric.firstCall.args[2], 'location-dmf-v1');
             done();
         });
     });