Merge remote-tracking branch 'origin/master' into feature/multistep-form-block

packages/backend-core/src/timers/timers.ts

@@ -50,7 +50,7 @@ export class ExecutionTimeTracker {
     return this.totalTimeMs
   }
 
-  private checkLimit() {
+  checkLimit() {
     if (this.totalTimeMs > this.limitMs) {
       throw new ExecutionTimeoutError(
         `Execution time limit of ${this.limitMs}ms exceeded: ${this.totalTimeMs}ms`

packages/server/src/jsRunner.ts

@@ -18,13 +18,16 @@ export function init() {
             bbCtx.jsExecutionTracker =
               timers.ExecutionTimeTracker.withLimit(perRequestLimit)
           }
-          track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
           span?.addTags({
             js: {
               limitMS: bbCtx.jsExecutionTracker.limitMs,
               elapsedMS: bbCtx.jsExecutionTracker.elapsedMS,
             },
           })
+          // We call checkLimit() here to prevent paying the cost of creating
+          // a new VM context below when we don't need to.
+          bbCtx.jsExecutionTracker.checkLimit()
+          track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
         }
       }