address comments fix

Author: sarthyparty

conformance/tests/grpcroute-weight.go

@@ -85,9 +85,9 @@ var GRPCRouteWeight = suite.ConformanceTest{
 				return resp.Response.GetAssertions().GetContext().GetPod(), nil
 			})
 
-			for i := 0; i < 10; i++ {
+			for i := 0; i < weight.MaxTestRetries; i++ {
 				if err := weight.TestWeightedDistribution(sender, expectedWeights); err != nil {
-					t.Logf("Traffic distribution test failed (%d/10): %s", i+1, err)
+					t.Logf("Traffic distribution test failed (%d/%d): %s", i+1, weight.MaxTestRetries, err)
 				} else {
 					return
 				}

conformance/tests/httproute-weight.go

@@ -83,9 +83,9 @@ var HTTPRouteWeight = suite.ConformanceTest{
 				return cReq.Pod, nil
 			})
 
-			for i := 0; i < 10; i++ {
+			for i := 0; i < weight.MaxTestRetries; i++ {
 				if err := weight.TestWeightedDistribution(sender, expectedWeights); err != nil {
-					t.Logf("Traffic distribution test failed (%d/10): %s", i+1, err)
+					t.Logf("Traffic distribution test failed (%d/%d): %s", i+1, weight.MaxTestRetries, err)
 				} else {
 					return
 				}

conformance/tests/mesh/grpcroute-weight.go

@@ -70,9 +70,9 @@ var MeshGRPCRouteWeight = suite.ConformanceTest{
 				return cRes.Hostname, nil
 			})
 
-			for i := 0; i < 10; i++ {
+			for i := 0; i < weight.MaxTestRetries; i++ {
 				if err := weight.TestWeightedDistribution(sender, expectedWeights); err != nil {
-					t.Logf("Traffic distribution test failed (%d/10): %s", i+1, err)
+					t.Logf("Traffic distribution test failed (%d/%d): %s", i+1, weight.MaxTestRetries, err)
 				} else {
 					return
 				}

conformance/tests/mesh/grpcroute-weight.yaml

@@ -17,3 +17,6 @@ spec:
     - name: echo-v2
       port: 7070
       weight: 30
+    - name: echo-v3
+      port: 7070
+      weight: 0

conformance/tests/mesh/httproute-weight.go

@@ -70,9 +70,9 @@ var MeshHTTPRouteWeight = suite.ConformanceTest{
 				return cRes.Hostname, nil
 			})
 
-			for i := 0; i < 10; i++ {
+			for i := 0; i < weight.MaxTestRetries; i++ {
 				if err := weight.TestWeightedDistribution(sender, expectedWeights); err != nil {
-					t.Logf("Traffic distribution test failed (%d/10): %s", i+1, err)
+					t.Logf("Traffic distribution test failed (%d/%d): %s", i+1, weight.MaxTestRetries, err)
 				} else {
 					return
 				}

conformance/utils/weight/weight.go

@@ -18,10 +18,11 @@ package weight
 
 import (
 	"cmp"
+	"crypto/rand"
 	"errors"
 	"fmt"
 	"math"
-	"math/rand/v2"
+	"math/big"
 	"slices"
 	"strconv"
 	"strings"
@@ -31,6 +32,12 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
+const (
+	// MaxTestRetries is the maximum number of times to retry the weight distribution test
+	// if it fails due to statistical variance before considering it a real failure
+	MaxTestRetries = 10
+)
+
 // RequestSender defines an interface for sending requests (HTTP, gRPC, or mesh)
 type RequestSender interface {
 	SendRequest() (podName string, err error)
@@ -132,27 +139,46 @@ func TestWeightedDistribution(sender RequestSender, expectedWeights map[string]f
 
 // addRandomDelay adds a random delay up to the specified limit in milliseconds
 func addRandomDelay(limit int) {
-	randomSleepDuration := rand.IntN(limit)
+	n, err := rand.Int(rand.Reader, big.NewInt(int64(limit)))
+	if err != nil {
+		// Fallback to no delay if crypto/rand fails
+		return
+	}
+	randomSleepDuration := n.Int64()
 	time.Sleep(time.Duration(randomSleepDuration) * time.Millisecond)
 }
 
 // AddRandomEntropy randomly chooses to add delay, random value, or both
 // The addRandomValue function should be provided by the caller to handle
 // protocol-specific ways of adding the random value (HTTP headers, gRPC metadata, etc.)
 func AddRandomEntropy(addRandomValue func(string) error) error {
-	random := rand.IntN(3)
+	n, err := rand.Int(rand.Reader, big.NewInt(3))
+	if err != nil {
+		// Fallback to case 0 if crypto/rand fails
+		addRandomDelay(1000)
+		return nil
+	}
+	random := n.Int64()
 
 	switch random {
 	case 0:
 		addRandomDelay(1000)
 		return nil
 	case 1:
-		randomValue := rand.IntN(10000)
-		return addRandomValue(strconv.Itoa(randomValue))
+		valueN, err := rand.Int(rand.Reader, big.NewInt(10000))
+		if err != nil {
+			return fmt.Errorf("failed to generate random value: %w", err)
+		}
+		randomValue := valueN.Int64()
+		return addRandomValue(strconv.FormatInt(randomValue, 10))
 	case 2:
 		addRandomDelay(1000)
-		randomValue := rand.IntN(10000)
-		return addRandomValue(strconv.Itoa(randomValue))
+		valueN, err := rand.Int(rand.Reader, big.NewInt(10000))
+		if err != nil {
+			return fmt.Errorf("failed to generate random value: %w", err)
+		}
+		randomValue := valueN.Int64()
+		return addRandomValue(strconv.FormatInt(randomValue, 10))
 	default:
 		return fmt.Errorf("invalid random value: %d", random)
 	}