fixup! Refactor: pass scanId as parameter instead of instance field and fix metric timing

fix(tests): update tests to reflect messageId removal and scanId parameter changes

Author: benzekrimaha

extensions/lifecycle/conductor/LifecycleConductor.js

@@ -569,7 +569,7 @@ class LifecycleConductor {
                         const canonicalId = split[0];
                         const bucketName = split[2];
 
-                        return { canonicalId, bucketName };
+                        return { canonicalId, bucketName, isLifecycled: true };
                     });
 
                 queue.push(batch);
@@ -673,7 +673,7 @@ class LifecycleConductor {
                                     const [canonicalId, bucketName] = marker.split(constants.splitter);
                                     if (!this._isBlacklisted(canonicalId, bucketName)) {
                                         nEnqueued += 1;
-                                        queue.push({ canonicalId, bucketName });
+                                        queue.push({ canonicalId, bucketName, isLifecycled: true });
                                         this.lastSentId = o.key;
                                     // Optimization:
                                     // If we only blacklist by accounts, and the last bucket is blacklisted