address comments

Signed-off-by: Eric Pickard <piceri@github.com>

Author: piceri

pkg/deploymentrecord/client.go

@@ -184,11 +184,6 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error {
 		return errors.New("record cannot be nil")
 	}
 
-	// Wait for request throttler
-	if err := c.requestThrottler.Wait(ctx); err != nil {
-		return fmt.Errorf("request throttler wait failed: %w", err)
-	}
-
 	url := fmt.Sprintf("%s/orgs/%s/artifacts/metadata/deployment-record", c.baseURL, c.org)
 
 	body, err := json.Marshal(record)
@@ -209,6 +204,10 @@ func (c *Client) PostOne(ctx context.Context, record *DeploymentRecord) error {
 			return err
 		}
 
+		if err = c.requestThrottler.Wait(ctx); err != nil {
+			return fmt.Errorf("request throttler wait failed: %w", err)
+		}
+
 		// Reset reader position for retries
 		bodyReader.Reset(body)
 
@@ -334,8 +333,11 @@ func (c *Client) waitForServerRateLimit(ctx context.Context) error {
 		"delay", delay.Round(time.Millisecond),
 	)
 
+	timer := time.NewTimer(delay)
+	defer timer.Stop()
+
 	select {
-	case <-time.After(delay):
+	case <-timer.C:
 		return nil
 	case <-ctx.Done():
 		return fmt.Errorf("context cancelled during server rate limit wait: %w", ctx.Err())
@@ -408,8 +410,11 @@ func waitForBackoff(ctx context.Context, attempt int) error {
 		}
 
 		// Wait with context cancellation support
+		timer := time.NewTimer(delay)
+		defer timer.Stop()
+
 		select {
-		case <-time.After(delay):
+		case <-timer.C:
 		case <-ctx.Done():
 			return fmt.Errorf("context cancelled during retry backoff: %w", ctx.Err())
 		}

pkg/deploymentrecord/client_test.go

@@ -703,17 +703,19 @@ func TestPostOneRespectsRetryAfterAcrossGoroutines(t *testing.T) {
 	time.Sleep(50 * time.Millisecond)
 
 	// Goroutine 2: must observe the shared backoff
+	secondReqDone := make(chan struct{})
 	start := time.Now()
 	wg.Go(func() {
+		defer close(secondReqDone)
 		if err := client.PostOne(ctx, testRecord()); err != nil {
 			t.Errorf("goroutine 2 error: %v", err)
 		}
 	})
-
-	wg.Wait()
-
+	// Measure only goroutine 2's duration
+	<-secondReqDone
 	elapsed := time.Since(start)
 	if elapsed < 1500*time.Millisecond {
 		t.Errorf("goroutine 2 should have waited for retry-after, but only waited %v", elapsed)
 	}
+	wg.Wait()
 }