Merge pull request #1718 from cloudflare/bench

Try to reduce benchmark drift

Author: prymitive

Makefile

@@ -59,9 +59,10 @@ coverhtml: test
 .PHONY: benchmark
 benchmark:
 	go test \
-		-timeout=15m \
-		-count=5 \
+		-timeout=20m \
+		-count=10 \
 		-run=none \
+		-short \
 		-bench=. \
 		-benchmem \
 		./...

cmd/pint/bench_test.go

@@ -156,7 +156,7 @@ rule {
 
 	b.ResetTimer()
 	for b.Loop() {
-		_, _ = checkRules(b.Context(), 10, false, gen, cfg, entries)
+		_, _ = checkRules(b.Context(), 1, false, gen, cfg, entries)
 	}
 }
 

internal/promapi/cache_test.go

@@ -285,6 +285,10 @@ func BenchmarkQueryCacheOnlySet(b *testing.B) {
 }
 
 func BenchmarkQueryCacheSetGrow(b *testing.B) {
+	if testing.Short() {
+		b.SkipNow()
+	}
+
 	const maxSize = 1000
 	mockErr := errors.New("Fake Error")
 	cache := newQueryCache(time.Minute, time.Now)
@@ -301,15 +305,22 @@ func BenchmarkQueryCacheSetGrow(b *testing.B) {
 }
 
 func BenchmarkQueryCacheGetMiss(b *testing.B) {
-	cache := newQueryCache(time.Minute, time.Now)
+	if testing.Short() {
+		b.SkipNow()
+	}
 
+	cache := newQueryCache(time.Minute, time.Now)
 	b.ResetTimer()
 	for n := 0; b.Loop(); n++ {
 		cache.get(uint64(n), "/foo")
 	}
 }
 
 func BenchmarkQueryCacheGC(b *testing.B) {
+	if testing.Short() {
+		b.SkipNow()
+	}
+
 	mockErr := errors.New("Fake Error")
 
 	for _, percent := range []uint64{0, 1, 10, 20, 25, 50, 75, 99, 100} {