refactor(label-utils): use withDatastoreLock helper (#5228)

Author: chingor13

packages/label-utils/src/label-utils.ts

@@ -14,7 +14,7 @@
 
 import {createHash} from 'crypto';
 import {logger as defaultLogger, GCFLogger} from 'gcf-utils';
-import {DatastoreLock} from '@google-automations/datastore-lock';
+import {withDatastoreLock} from '@google-automations/datastore-lock';
 /* eslint-disable-next-line node/no-extraneous-import */
 import {Octokit} from '@octokit/rest';
 
@@ -41,16 +41,18 @@ export async function syncLabels(
   labels: Array<Label>,
   logger: GCFLogger = defaultLogger
 ): Promise<void> {
-  const l = new DatastoreLock('label-sync', `${owner}/${repo}`);
-  const lockResult = await l.acquire();
-  if (!lockResult) {
-    logger.error(`Failed to acquire the lock for ${owner}/${repo}`);
-    return;
-  }
   try {
-    return syncLabelsImpl(octokit, owner, repo, labels);
-  } finally {
-    await l.release();
+    await withDatastoreLock(
+      {
+        lockId: 'label-sync',
+        target: `${owner}/${repo}`,
+      },
+      async () => {
+        return await syncLabelsImpl(octokit, owner, repo, labels, logger);
+      }
+    );
+  } catch (e) {
+    logger.error('Failed to acquire the lock:', e);
   }
 }