Add logs

src/internal/common/limiters/limiter.go

@@ -4,5 +4,6 @@ import "context"
 
 type Limiter interface {
 	Wait(ctx context.Context) error
+	WaitN(ctx context.Context, n int) error
 	Shutdown()
 }

src/internal/common/limiters/sliding_window.go

@@ -84,16 +84,28 @@ func NewSlidingWindowLimiter(
 }
 
 // Wait blocks a request until a token is available or the context is cancelled.
-// TODO(pandeyabs): Implement WaitN.
+// Equivalent to calling WaitN(ctx, 1).
 func (s *slidingWindow) Wait(ctx context.Context) error {
-	select {
+	return s.WaitN(ctx, 1)
-	case <-ctx.Done():
+}
-		return clues.Stack(ctx.Err())
-	case <-s.permits:
-		s.mu.Lock()
-		defer s.mu.Unlock()
 
-		s.curr.count[s.currentInterval]++
+// WaitN blocks a request until n tokens are available or the context gets
+// cancelled. WaitN should be called with n <= capacity otherwise it will block
+// forever.
+//
+// TODO(pandeyabs): Enforce n <= capacity check. Not adding it right now because
+// we are relying on capacity = 0 for ctx cancellation test, which would need
+// some refactoring.
+func (s *slidingWindow) WaitN(ctx context.Context, n int) error {
+	for i := 0; i < n; i++ {
+		select {
+		case <-ctx.Done():
+			return clues.Stack(ctx.Err())
+		case <-s.permits:
+			s.mu.Lock()
+			s.curr.count[s.currentInterval]++
+			s.mu.Unlock()
+		}
 	}
 
 	return nil

src/internal/common/limiters/sliding_window_test.go

@@ -81,57 +81,81 @@ func (suite *SlidingWindowUnitTestSuite) TestWaitBasic() {
 }
 
 // TestWaitSliding tests the sliding window functionality of the limiter with
-// time distributed Wait() calls.
+// time distributed WaitN() calls.
 func (suite *SlidingWindowUnitTestSuite) TestWaitSliding() {
-	var (
+	tests := []struct {
-		t             = suite.T()
+		Name          string
-		windowSize    = 1 * time.Second
+		windowSize    time.Duration
-		slideInterval = 10 * time.Millisecond
+		slideInterval time.Duration
-		capacity      = 100
+		capacity      int
-		// Test will run for duration of 2 windowSize.
+		numRequests   int
-		numRequests = 2 * capacity
+		n             int
-		wg          sync.WaitGroup
+	}{
-	)
+		{
-
+			Name:          "Request 1 token each",
-	defer goleak.VerifyNone(t)
+			windowSize:    1 * time.Second,
-
+			slideInterval: 10 * time.Millisecond,
-	ctx, flush := tester.NewContext(t)
+			capacity:      100,
-	defer flush()
+			numRequests:   200,
-
+			n:             1,
-	s, err := NewSlidingWindowLimiter(windowSize, slideInterval, capacity)
+		},
-	require.NoError(t, err)
+		{
-
+			Name:          "Request 5 tokens each",
-	// Make concurrent requests to the limiter
+			windowSize:    1 * time.Second,
-	for i := 0; i < numRequests; i++ {
+			slideInterval: 10 * time.Millisecond,
-		wg.Add(1)
+			capacity:      100,
-
+			numRequests:   100,
-		go func() {
+			n:             5,
-			defer wg.Done()
+		},
-
-			// Sleep for a random duration to spread out requests over multiple slide
-			// intervals & windows, so that we can test the sliding window logic better.
-			// Without this, the requests will be bunched up in the very first intervals
-			// of the 2 windows. Rest of the intervals will be empty.
-			time.Sleep(time.Duration(rand.Intn(1500)) * time.Millisecond)
-
-			err := s.Wait(ctx)
-			require.NoError(t, err)
-		}()
 	}
-	wg.Wait()
 
-	// Shutdown the ticker before accessing the internal limiter state.
+	for _, test := range tests {
-	s.Shutdown()
+		suite.Run(test.Name, func() {
+			t := suite.T()
 
-	// Verify that number of requests allowed in each window is less than or equal
+			defer goleak.VerifyNone(t)
-	// to window capacity
-	sw := s.(*slidingWindow)
-	data := append(sw.prev.count, sw.curr.count...)
 
-	sums := slidingSums(data, sw.numIntervals)
+			ctx, flush := tester.NewContext(t)
+			defer flush()
 
-	for _, sum := range sums {
+			s, err := NewSlidingWindowLimiter(test.windowSize, test.slideInterval, test.capacity)
-		require.True(t, sum <= capacity, "sum: %d, capacity: %d", sum, capacity)
+			require.NoError(t, err)
+
+			var wg sync.WaitGroup
+
+			// Make concurrent requests to the limiter
+			for i := 0; i < test.numRequests; i++ {
+				wg.Add(1)
+
+				go func() {
+					defer wg.Done()
+
+					// Sleep for a random duration to spread out requests over multiple slide
+					// intervals & windows, so that we can test the sliding window logic better.
+					// Without this, the requests will be bunched up in the very first intervals
+					// of the 2 windows. Rest of the intervals will be empty.
+					time.Sleep(time.Duration(rand.Intn(1500)) * time.Millisecond)
+
+					err := s.WaitN(ctx, test.n)
+					require.NoError(t, err)
+				}()
+			}
+			wg.Wait()
+
+			// Shutdown the ticker before accessing the internal limiter state.
+			s.Shutdown()
+
+			// Verify that number of requests allowed in each window is less than or equal
+			// to window capacity
+			sw := s.(*slidingWindow)
+			data := append(sw.prev.count, sw.curr.count...)
+
+			sums := slidingSums(data, sw.numIntervals)
+
+			for _, sum := range sums {
+				require.True(t, sum <= test.capacity, "sum: %d, capacity: %d", sum, test.capacity)
+			}
+		})
 	}
 }