handling histograms with duplicate buckets

cockroachlabs · Jan 7, 2022 · 9ddbe61 · 9ddbe61
1 parent d22b1b5
commit 9ddbe61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/internal/lib/histograms.go b/internal/lib/histograms.go
@@ -108,10 +108,17 @@ func TranslateHistogram(config *BucketConfig, mf *dto.MetricFamily) {
 		var prev *dto.Bucket = nil
 		requiredBuckets := 1
 		max := 0.0
+		//fmt.Printf("Metric %+v\n", mf)
 		if len(m.Histogram.Bucket) >= 2 {
-			max = m.Histogram.Bucket[len(m.Histogram.Bucket)-2].GetUpperBound()
 			if config.Endns > 0 {
 				max = float64(config.Endns)
+			} else {
+				for _, b := range m.Histogram.Bucket {
+					u := b.GetUpperBound()
+					if u != math.Inf(1) && u > max {
+						max = u
+					}
+				}
 			}
 			requiredBuckets = requiredBuckets + int(math.Ceil(math.Log10(float64(max))))*bins
 		}

diff --git a/internal/lib/histograms_test.go b/internal/lib/histograms_test.go
@@ -41,7 +41,6 @@ func TestHistogramConversion(t *testing.T) {
 		TranslateHistogram(config, mf)
 		var buf bytes.Buffer
 		expfmt.MetricFamilyToText(&buf, mf)
-
 		assert.Equal(output, buf.String())
 	}
 }

diff --git a/main.go b/main.go
@@ -102,7 +102,7 @@ func main() {
 
 		metricFamilies, err := reader.ReadMetrics(ctx)
 		if err != nil {
-			w.WriteHeader(500)
+			w.WriteHeader(http.StatusInternalServerError)
 			fmt.Fprintln(w, err)
 			return
 		}