Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.github/workflows/start-beta.yml

@@ -42,6 +42,8 @@ jobs:
           npm ci
 
       - name: Start Release
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
           node scripts/release.js beta \
             --merge-branch="${{ github.event.inputs.mergeBranch || 'main' }}" \

.github/workflows/start-ga.yaml

@@ -44,6 +44,7 @@ jobs:
       - name: Start Release
         env:
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+          GH_TOKEN: ${{ github.token }}
         run: |
           node scripts/release.js ga \
             --release-ticket="${{ github.event.inputs.releaseTicket }}" \

packages/data-service/src/data-service.ts

@@ -1717,8 +1717,12 @@ class DataServiceImpl extends WithLogContext implements DataService {
     return coll.dropSearchIndex(name);
   }
 
-  @op(mongoLogId(1_001_000_041), ([ns, pipeline]) => {
-    return { ns, stages: pipeline.map((stage) => Object.keys(stage)[0]) };
+  @op(mongoLogId(1_001_000_041), ([ns, pipeline, options]) => {
+    return {
+      ns,
+      stages: pipeline.map((stage) => Object.keys(stage)[0]),
+      maxTimeMS: options?.maxTimeMS,
+    };
   })
   aggregateCursor(
     ns: string,