metrics: not compare float numbers directly (ethereum#20219)

JukLee0ira · Dec 20, 2024 · ec3ec40 · ec3ec40
1 parent b2add4a
commit ec3ec40
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 50 deletions.
diff --git a/metrics/doc.go b/metrics/doc.go
@@ -0,0 +1,4 @@
+package metrics
+
+const epsilon = 0.0000000000000001
+const epsilonPercentile = .00000000001
diff --git a/metrics/ewma_test.go b/metrics/ewma_test.go
@@ -1,6 +1,9 @@
 package metrics
 
-import "testing"
+import (
+	"math"
+	"testing"
+)
 
 func BenchmarkEWMA(b *testing.B) {
 	a := NewEWMA1()
@@ -15,67 +18,67 @@ func TestEWMA1(t *testing.T) {
 	a := NewEWMA1()
 	a.Update(3)
 	a.Tick()
-	if rate := a.Rate(); rate != 0.6 {
+	if rate := a.Rate(); math.Abs(0.6-rate) > epsilon {
 		t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.22072766470286553 {
+	if rate := a.Rate(); math.Abs(0.22072766470286553-rate) > epsilon {
 		t.Errorf("1 minute a.Rate(): 0.22072766470286553 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.08120116994196772 {
+	if rate := a.Rate(); math.Abs(0.08120116994196772-rate) > epsilon {
 		t.Errorf("2 minute a.Rate(): 0.08120116994196772 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.029872241020718428 {
+	if rate := a.Rate(); math.Abs(0.029872241020718428-rate) > epsilon {
 		t.Errorf("3 minute a.Rate(): 0.029872241020718428 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.01098938333324054 {
+	if rate := a.Rate(); math.Abs(0.01098938333324054-rate) > epsilon {
 		t.Errorf("4 minute a.Rate(): 0.01098938333324054 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.004042768199451294 {
+	if rate := a.Rate(); math.Abs(0.004042768199451294-rate) > epsilon {
 		t.Errorf("5 minute a.Rate(): 0.004042768199451294 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.0014872513059998212 {
+	if rate := a.Rate(); math.Abs(0.0014872513059998212-rate) > epsilon {
 		t.Errorf("6 minute a.Rate(): 0.0014872513059998212 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.0005471291793327122 {
+	if rate := a.Rate(); math.Abs(0.0005471291793327122-rate) > epsilon {
 		t.Errorf("7 minute a.Rate(): 0.0005471291793327122 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.00020127757674150815 {
+	if rate := a.Rate(); math.Abs(0.00020127757674150815-rate) > epsilon {
 		t.Errorf("8 minute a.Rate(): 0.00020127757674150815 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 7.404588245200814e-05 {
+	if rate := a.Rate(); math.Abs(7.404588245200814e-05-rate) > epsilon {
 		t.Errorf("9 minute a.Rate(): 7.404588245200814e-05 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 2.7239957857491083e-05 {
+	if rate := a.Rate(); math.Abs(2.7239957857491083e-05-rate) > epsilon {
 		t.Errorf("10 minute a.Rate(): 2.7239957857491083e-05 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 1.0021020474147462e-05 {
+	if rate := a.Rate(); math.Abs(1.0021020474147462e-05-rate) > epsilon {
 		t.Errorf("11 minute a.Rate(): 1.0021020474147462e-05 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 3.6865274119969525e-06 {
+	if rate := a.Rate(); math.Abs(3.6865274119969525e-06-rate) > epsilon {
 		t.Errorf("12 minute a.Rate(): 3.6865274119969525e-06 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 1.3561976441886433e-06 {
+	if rate := a.Rate(); math.Abs(1.3561976441886433e-06-rate) > epsilon {
 		t.Errorf("13 minute a.Rate(): 1.3561976441886433e-06 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 4.989172314621449e-07 {
+	if rate := a.Rate(); math.Abs(4.989172314621449e-07-rate) > epsilon {
 		t.Errorf("14 minute a.Rate(): 4.989172314621449e-07 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 1.8354139230109722e-07 {
+	if rate := a.Rate(); math.Abs(1.8354139230109722e-07-rate) > epsilon {
 		t.Errorf("15 minute a.Rate(): 1.8354139230109722e-07 != %v\n", rate)
 	}
 }
@@ -84,67 +87,67 @@ func TestEWMA5(t *testing.T) {
 	a := NewEWMA5()
 	a.Update(3)
 	a.Tick()
-	if rate := a.Rate(); rate != 0.6 {
+	if rate := a.Rate(); math.Abs(0.6-rate) > epsilon {
 		t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.49123845184678905 {
+	if rate := a.Rate(); math.Abs(0.49123845184678905-rate) > epsilon {
 		t.Errorf("1 minute a.Rate(): 0.49123845184678905 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.4021920276213837 {
+	if rate := a.Rate(); math.Abs(0.4021920276213837-rate) > epsilon {
 		t.Errorf("2 minute a.Rate(): 0.4021920276213837 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.32928698165641596 {
+	if rate := a.Rate(); math.Abs(0.32928698165641596-rate) > epsilon {
 		t.Errorf("3 minute a.Rate(): 0.32928698165641596 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.269597378470333 {
+	if rate := a.Rate(); math.Abs(0.269597378470333-rate) > epsilon {
 		t.Errorf("4 minute a.Rate(): 0.269597378470333 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.2207276647028654 {
+	if rate := a.Rate(); math.Abs(0.2207276647028654-rate) > epsilon {
 		t.Errorf("5 minute a.Rate(): 0.2207276647028654 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.18071652714732128 {
+	if rate := a.Rate(); math.Abs(0.18071652714732128-rate) > epsilon {
 		t.Errorf("6 minute a.Rate(): 0.18071652714732128 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.14795817836496392 {
+	if rate := a.Rate(); math.Abs(0.14795817836496392-rate) > epsilon {
 		t.Errorf("7 minute a.Rate(): 0.14795817836496392 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.12113791079679326 {
+	if rate := a.Rate(); math.Abs(0.12113791079679326-rate) > epsilon {
 		t.Errorf("8 minute a.Rate(): 0.12113791079679326 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.09917933293295193 {
+	if rate := a.Rate(); math.Abs(0.09917933293295193-rate) > epsilon {
 		t.Errorf("9 minute a.Rate(): 0.09917933293295193 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.08120116994196763 {
+	if rate := a.Rate(); math.Abs(0.08120116994196763-rate) > epsilon {
 		t.Errorf("10 minute a.Rate(): 0.08120116994196763 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.06648189501740036 {
+	if rate := a.Rate(); math.Abs(0.06648189501740036-rate) > epsilon {
 		t.Errorf("11 minute a.Rate(): 0.06648189501740036 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.05443077197364752 {
+	if rate := a.Rate(); math.Abs(0.05443077197364752-rate) > epsilon {
 		t.Errorf("12 minute a.Rate(): 0.05443077197364752 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.04456414692860035 {
+	if rate := a.Rate(); math.Abs(0.04456414692860035-rate) > epsilon {
 		t.Errorf("13 minute a.Rate(): 0.04456414692860035 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.03648603757513079 {
+	if rate := a.Rate(); math.Abs(0.03648603757513079-rate) > epsilon {
 		t.Errorf("14 minute a.Rate(): 0.03648603757513079 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.0298722410207183831020718428 {
+	if rate := a.Rate(); math.Abs(0.0298722410207183831020718428-rate) > epsilon {
 		t.Errorf("15 minute a.Rate(): 0.0298722410207183831020718428 != %v\n", rate)
 	}
 }
@@ -153,67 +156,67 @@ func TestEWMA15(t *testing.T) {
 	a := NewEWMA15()
 	a.Update(3)
 	a.Tick()
-	if rate := a.Rate(); rate != 0.6 {
+	if rate := a.Rate(); math.Abs(0.6-rate) > epsilon {
 		t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.5613041910189706 {
+	if rate := a.Rate(); math.Abs(0.5613041910189706-rate) > epsilon {
 		t.Errorf("1 minute a.Rate(): 0.5613041910189706 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.5251039914257684 {
+	if rate := a.Rate(); math.Abs(0.5251039914257684-rate) > epsilon {
 		t.Errorf("2 minute a.Rate(): 0.5251039914257684 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.4912384518467888184678905 {
+	if rate := a.Rate(); math.Abs(0.4912384518467888184678905-rate) > epsilon {
 		t.Errorf("3 minute a.Rate(): 0.4912384518467888184678905 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.459557003018789 {
+	if rate := a.Rate(); math.Abs(0.459557003018789-rate) > epsilon {
 		t.Errorf("4 minute a.Rate(): 0.459557003018789 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.4299187863442732 {
+	if rate := a.Rate(); math.Abs(0.4299187863442732-rate) > epsilon {
 		t.Errorf("5 minute a.Rate(): 0.4299187863442732 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.4021920276213831 {
+	if rate := a.Rate(); math.Abs(0.4021920276213831-rate) > epsilon {
 		t.Errorf("6 minute a.Rate(): 0.4021920276213831 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.37625345116383313 {
+	if rate := a.Rate(); math.Abs(0.37625345116383313-rate) > epsilon {
 		t.Errorf("7 minute a.Rate(): 0.37625345116383313 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.3519877317060185 {
+	if rate := a.Rate(); math.Abs(0.3519877317060185-rate) > epsilon {
 		t.Errorf("8 minute a.Rate(): 0.3519877317060185 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.3292869816564153165641596 {
+	if rate := a.Rate(); math.Abs(0.3292869816564153165641596-rate) > epsilon {
 		t.Errorf("9 minute a.Rate(): 0.3292869816564153165641596 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.3080502714195546 {
+	if rate := a.Rate(); math.Abs(0.3080502714195546-rate) > epsilon {
 		t.Errorf("10 minute a.Rate(): 0.3080502714195546 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.2881831806538789 {
+	if rate := a.Rate(); math.Abs(0.2881831806538789-rate) > epsilon {
 		t.Errorf("11 minute a.Rate(): 0.2881831806538789 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.26959737847033216 {
+	if rate := a.Rate(); math.Abs(0.26959737847033216-rate) > epsilon {
 		t.Errorf("12 minute a.Rate(): 0.26959737847033216 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.2522102307052083 {
+	if rate := a.Rate(); math.Abs(0.2522102307052083-rate) > epsilon {
 		t.Errorf("13 minute a.Rate(): 0.2522102307052083 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.23594443252115815 {
+	if rate := a.Rate(); math.Abs(0.23594443252115815-rate) > epsilon {
 		t.Errorf("14 minute a.Rate(): 0.23594443252115815 != %v\n", rate)
 	}
 	elapseMinute(a)
-	if rate := a.Rate(); rate != 0.2207276647028646247028654470286553 {
+	if rate := a.Rate(); math.Abs(0.2207276647028646247028654470286553-rate) > epsilon {
 		t.Errorf("15 minute a.Rate(): 0.2207276647028646247028654470286553 != %v\n", rate)
 	}
 }

diff --git a/metrics/sample_test.go b/metrics/sample_test.go
@@ -1,6 +1,7 @@
 package metrics
 
 import (
+	"math"
 	"math/rand"
 	"runtime"
 	"testing"
@@ -326,7 +327,7 @@ func testUniformSampleStatistics(t *testing.T, s Sample) {
 	if ps[1] != 7380.5 {
 		t.Errorf("75th percentile: 7380.5 != %v\n", ps[1])
 	}
-	if ps[2] != 9986.429999999998 {
+	if math.Abs(ps[2]-9986.429999999998) > epsilonPercentile {
 		t.Errorf("99th percentile: 9986.429999999998 != %v\n", ps[2])
 	}
 }