fixed CI and unit tests

Signed-off-by: amanycodes <amanycodes@gmail.com>

Author: amanycodes

promql/functions.go

@@ -1365,11 +1365,12 @@ func funcHistogramStdDev(vals []parser.Value, _ parser.Expressions, enh *EvalNod
 				continue
 			}
 			var val float64
-			if bucket.Lower <= 0 && 0 <= bucket.Upper {
+			switch {
+			case bucket.Lower <= 0 && bucket.Upper >= 0:
 				val = 0
-			} else if sample.H.Schema == -53 {
-				val = (bucket.Upper * bucket.Lower) / 2.0
-			} else {
+			case sample.H.Schema == -53:
+				val = (bucket.Upper + bucket.Lower) / 2.0
+			default:
 				val = math.Sqrt(bucket.Upper * bucket.Lower)
 				if bucket.Upper < 0 {
 					val = -val
@@ -1410,10 +1411,13 @@ func funcHistogramStdVar(vals []parser.Value, _ parser.Expressions, enh *EvalNod
 				continue
 			}
 			var val float64
-			if bucket.Lower <= 0 && 0 <= bucket.Upper {
+			switch {
+			case bucket.Lower <= 0 && bucket.Upper >= 0:
 				val = 0
-			} else {
-				val = (bucket.Upper * bucket.Lower) / 2.0
+			case sample.H.Schema == -53:
+				val = (bucket.Upper + bucket.Lower) / 2.0
+			default:
+				val = math.Sqrt(bucket.Upper * bucket.Lower)
 				if bucket.Upper < 0 {
 					val = -val
 				}

promql/promqltest/testdata/histograms.test

@@ -95,13 +95,13 @@ eval instant at 50m histogram_avg(testhistogram3)
 
 # Test histogram_stddev. This has no classic equivalent.
 eval instant at 50m histogram_stddev(testhistogram3)
-	{start="positive"} 2.962188994031886
-	{start="negative"} 3.9825070621406313
+	{start="positive"} 2.768081055040247
+	{start="negative"} 4.187667907081458
 
 # Test histogram_stdvar. This has no classic equivalent.
 eval instant at 50m histogram_stdvar(testhistogram3)
-	{start="positive"} 8.774563636363636
-	{start="negative"} 16.1403625
+	{start="positive"} 7.662272727272727
+	{start="negative"} 17.536562500000002
 
 # Test histogram_fraction.
 

promql/promqltest/testdata/native_histograms.test

@@ -316,7 +316,7 @@ eval instant at 10m histogram_stddev(histogram_stddev_stdvar_1)
     {} 1.0787993180043811
 
 eval instant at 10m histogram_stdvar(histogram_stddev_stdvar_1)
-    {} 6.989062678269235
+    {} 1.163807968526718
 
 clear
 
@@ -328,7 +328,7 @@ eval instant at 10m histogram_stddev(histogram_stddev_stdvar_2)
     {} 0.0048960313898237465
 
 eval instant at 10m histogram_stdvar(histogram_stddev_stdvar_2)
-    {} 0.2459387851382203
+    {} 2.3971123370139447e-05
 
 clear
 
@@ -340,7 +340,7 @@ eval instant at 10m histogram_stddev(histogram_stddev_stdvar_3)
     {} 42.94723640025793
 
 eval instant at 10m histogram_stdvar(histogram_stddev_stdvar_3)
-    {} 4.273131069595293e+06
+    {} 1844.4651144196398
 
 clear
 
@@ -352,7 +352,7 @@ eval instant at 10m histogram_stddev(histogram_stddev_stdvar_4)
     {} 27556.344499842402
 
 eval instant at 10m histogram_stdvar(histogram_stddev_stdvar_4)
-    {} 1.8451149327095644e+18
+    {} 7.593521221939945e+08
 
 clear
 
@@ -364,7 +364,7 @@ eval instant at 10m histogram_stddev(histogram_stddev_stdvar_5)
     {} 1.3137084989847612
 
 eval instant at 10m histogram_stdvar(histogram_stddev_stdvar_5)
-    {} 2916
+    {} 1.725830020304794
 
 clear