BAAS-28597: Add counter for limiter wait calls

runtime.go

@@ -205,6 +205,9 @@
 	limiterTicksLeft int
 	ticks            uint64
 
+	limiterWaitCount     int64
+	limiterWaitTotalTime time.Duration
+
 	tickMetricTrackingEnabled bool
 	tickMetrics               map[string]uint64
 }
@@ -213,6 +216,16 @@
 	return self.ticks
 }
 
+// LimiterWaitCount tracks the amount of times the rate limiter throttles the execution.
+func (self *Runtime) LimiterWaitCount() int64 {
+	return self.limiterWaitCount
+}
+
+// LimiterWaitTotalTime tracks the total amount of time that the execution was throttled.
+func (self *Runtime) LimiterWaitTotalTime() time.Duration {
+	return self.limiterWaitTotalTime
+}
+
 // SetStackTraceLimit sets an upper limit to the number of stack frames that
 // goja will use when formatting an error's stack trace. By default, the limit
 // is 10. This is consistent with V8 and SpiderMonkey.
@@ -498,7 +511,7 @@
 	// It is simpler, and not costly, to just have this map always initialized.
 	r.tickMetrics = make(map[string]uint64)
 
 	r.SetRateLimiter(rate.NewLimiter(rate.Inf, maxInt))
 }
 
 func (r *Runtime) typeErrorResult(throw bool, args ...interface{}) {

vm.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	"github.com/dop251/goja/unistring"
 )
@@ -617,17 +618,25 @@ func (vm *vm) run() {
 				ctx = context.Background()
 			}
 
-			if waitErr := vm.r.limiter.WaitN(ctx, vm.r.limiterTicksLeft); waitErr != nil {
-				if vm.r.vm.ctx == nil {
-					panic(waitErr)
-				}
-				if ctxErr := vm.r.vm.ctx.Err(); ctxErr != nil {
-					panic(ctxErr)
-				}
-				if strings.Contains(waitErr.Error(), "would exceed") {
-					panic(context.DeadlineExceeded)
+			now := time.Now()
+			r := vm.r.limiter.ReserveN(now, vm.r.limiterTicksLeft)
+			if !r.OK() {
+				panic("failed to make reservation")
+			}
+
+			if delay := r.DelayFrom(now); delay > 0 {
+				vm.r.limiterWaitCount++
+				vm.r.limiterWaitTotalTime += delay
+
+				if err := sleep(ctx, delay); err != nil {
+					r.Cancel()
+					panic(err)
 				}
-				panic(waitErr)
+			}
+			select {
+			case <-ctx.Done():
+				panic(ctx.Err())
+			default:
 			}
 		}
 
@@ -5606,3 +5615,15 @@ func (s valueStack) MemUsage(ctx *MemUsageContext) (memUsage uint64, newMemUsage
 
 	return memUsage, newMemUsage, nil
 }
+
+// sleep is equivalent to time.Sleep, but is interruptible via context cancelation.
+func sleep(ctx context.Context, duration time.Duration) error {
+	timer := time.NewTimer(duration)
+	defer timer.Stop()
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-timer.C:
+		return nil
+	}
+}