Fix metric timing and code quality issues

- Move bucket done metric to task completion callback (only count successes)
- Fix conductor full scan metric to skip throttled/error cases
- Fix line length violation and indentation issues

Issue: BB-740

Author: benzekrimaha

extensions/lifecycle/LifecycleMetrics.js

@@ -263,8 +263,9 @@ class LifecycleMetrics {
     }
 
     /**
-     * Increment the count of lifecycle-enabled buckets processed
-     * during the current scan.
+     * Increment the count of lifecycle-enabled buckets successfully processed
+     * during the current scan. This is called after the bucket task completes
+     * successfully, not when it is dispatched to the scheduler.
      * @param {Object} log - logger
      */
     static onBucketProcessorBucketDone(log) {

extensions/lifecycle/bucketProcessor/LifecycleBucketProcessor.js

@@ -364,8 +364,6 @@ class LifecycleBucketProcessor {
                 return cb();
             }
 
-            LifecycleMetrics.onBucketProcessorBucketDone(this._log);
-
             let task;
 
             if (taskVersion === lifecycleTaskVersions.v1 || (!taskVersion && this._lcConfig.forceLegacyListing)) {
@@ -388,7 +386,15 @@ class LifecycleBucketProcessor {
                 value: result,
                 s3target: s3Client,
                 backbeatMetadataProxy,
-            }, cb);
+            }, (err) => {
+                // Increment metric after task successfully completes
+                // This ensures we count actual processing completion, not just dispatch
+                // Only count successful completions, not failures
+                if (!err) {
+                    LifecycleMetrics.onBucketProcessorBucketDone(this._log);
+                }
+                return cb(err);
+            });
         });
     }
 

extensions/lifecycle/conductor/LifecycleConductor.js

@@ -358,7 +358,8 @@ class LifecycleConductor {
 
     _createBucketTaskMessages(tasks, scanId, log, cb) {
         if (this.lcConfig.forceLegacyListing) {
-            return process.nextTick(cb, null, tasks.map(t => this._taskToMessage(t, lifecycleTaskVersions.v1, scanId, log)));
+            return process.nextTick(cb, null, tasks.map(t =>
+                this._taskToMessage(t, lifecycleTaskVersions.v1, scanId, log)));
         }
 
         return async.mapLimit(tasks, 10, (t, taskDone) =>
@@ -460,13 +461,6 @@ class LifecycleConductor {
             },
         ], err => {
             const elapsedMs = Date.now() - start;
-            LifecycleMetrics.onConductorFullScan(
-                log,
-                elapsedMs,
-                nBucketsListed,
-                nBucketsQueued,
-                nLifecycledBuckets
-            );
             if (err && err.Throttling) {
                 log.info('not starting new lifecycle batch', {
                     reason: err,
@@ -485,20 +479,29 @@ class LifecycleConductor {
             const unknownCanonicalIds = this._accountIdCache.getMisses();
 
             if (err) {
-            log.error('lifecycle batch failed', {
-                error: err,
-                unknownCanonicalIds,
-                conductorScanId: scanId,
-                fullScanElapsedMs: elapsedMs,
-                nBucketsListed,
-                workflowsQueued: messageDeliveryReports,
-            });
+                log.error('lifecycle batch failed', {
+                    error: err,
+                    unknownCanonicalIds,
+                    conductorScanId: scanId,
+                    fullScanElapsedMs: elapsedMs,
+                    nBucketsListed,
+                    workflowsQueued: messageDeliveryReports,
+                });
                 if (cb) {
                     cb(err);
                 }
                 return;
             }
 
+            // Only record metrics after a real scan completes (not throttled)
+            LifecycleMetrics.onConductorFullScan(
+                log,
+                elapsedMs,
+                nBucketsListed,
+                nBucketsQueued,
+                nLifecycledBuckets
+            );
+
             log.info('finished pushing lifecycle batch', {
                 nBucketsQueued,
                 nLifecycledBuckets,