From 295bf20cfd2ff8113f21907027826a7165a39c3b Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Tue, 23 Jun 2026 15:14:15 +0000
Subject: [PATCH] prober: deflake TestHTTPBandwidth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The test transferred only 64 KiB over loopback, which can complete
within a single clock tick on fast CI machines, causing
time.Since(start).Seconds() to return 0 and the
"transfer_time_seconds_total > 0" assertion to fail.

Increase the payload to 1 MiB so zero is genuinely implausible, and
retry up to 3 additional times. If the metric is still zero after 4
total attempts, fail hard — at that size it means the timing logic is
actually broken.

Fixes #20213

Change-Id: I3fab510ce8c567506fea5ad803d35acf40d65700
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 prober/http_test.go | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/prober/http_test.go b/prober/http_test.go
index 127256017..544565de2 100644
--- a/prober/http_test.go
+++ b/prober/http_test.go
@@ -52,7 +52,7 @@ func metricValue(t *testing.T, metrics []prometheus.Metric, name string) float64
 }
 
 func TestHTTPBandwidth(t *testing.T) {
-	const size = 1 << 16 // 64 KiB
+	const size = 1 << 20 // 1 MiB
 
 	mux := http.NewServeMux()
 	// /download writes exactly `size` zero bytes.
@@ -109,6 +109,9 @@ func TestHTTPBandwidth(t *testing.T) {
 				t.Fatal("Metrics callback is nil")
 			}
 			metrics := pc.Metrics(prometheus.Labels{})
+			transferTime := func() float64 {
+				return metricValue(t, metrics, "http_bw_transfer_time_seconds_total")
+			}
 			wantDescs := map[string]bool{
 				"http_bw_probe_size_bytes":            false,
 				"http_bw_transfer_time_seconds_total": false,
@@ -137,8 +140,23 @@ func TestHTTPBandwidth(t *testing.T) {
 			if got := metricValue(t, metrics, "http_bw_bytes_total"); got != float64(tc.size) {
 				t.Errorf("http_bw_bytes_total = %v, want %v", got, tc.size)
 			}
-			if got := metricValue(t, metrics, "http_bw_transfer_time_seconds_total"); got <= 0 {
-				t.Errorf("http_bw_transfer_time_seconds_total = %v, want > 0", got)
+			// The transfer time counter accumulates across Probe calls.
+			// At 1 MiB over loopback a zero reading means the timing logic
+			// is broken, but retry a few times.
+			if transferTime() <= 0 {
+				const retries = 3
+				for range retries {
+					if err := pc.Probe(ctx); err != nil {
+						t.Fatalf("Probe() = %v, want nil", err)
+					}
+					metrics = pc.Metrics(prometheus.Labels{})
+					if transferTime() > 0 {
+						break
+					}
+				}
+				if transferTime() <= 0 {
+					t.Fatalf("http_bw_transfer_time_seconds_total = 0 after %d attempts, want > 0", retries+1)
+				}
 			}
 		})
 	}