fix #3281: promtheus exporter will cumulatively sum hist buckets

open-telemetry · Oct 13, 2022 · 4106fd9 · 4106fd9
1 parent 84e28fd
commit 4106fd9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/exporters/prometheus/exporter.go b/exporters/prometheus/exporter.go
@@ -145,8 +145,11 @@ func getHistogramMetricData(histogram metricdata.Histogram, m metricdata.Metrics
 		keys, values := getAttrs(dp.Attributes)
 		desc := prometheus.NewDesc(sanitizeName(m.Name), m.Description, keys, nil)
 		buckets := make(map[float64]uint64, len(dp.Bounds))
+
+		cumulativeCount := uint64(0)
 		for i, bound := range dp.Bounds {
-			buckets[bound] = dp.BucketCounts[i]
+			cumulativeCount += dp.BucketCounts[i]
+			buckets[bound] = cumulativeCount
 		}
 		md := &metricData{
 			name:             m.Name,

diff --git a/exporters/prometheus/testdata/histogram.txt b/exporters/prometheus/testdata/histogram.txt
@@ -3,13 +3,13 @@
 histogram_baz_bucket{A="B",C="D",le="0"} 0
 histogram_baz_bucket{A="B",C="D",le="5"} 0
 histogram_baz_bucket{A="B",C="D",le="10"} 1
-histogram_baz_bucket{A="B",C="D",le="25"} 1
-histogram_baz_bucket{A="B",C="D",le="50"} 0
-histogram_baz_bucket{A="B",C="D",le="75"} 0
-histogram_baz_bucket{A="B",C="D",le="100"} 0
-histogram_baz_bucket{A="B",C="D",le="250"} 2
-histogram_baz_bucket{A="B",C="D",le="500"} 0
-histogram_baz_bucket{A="B",C="D",le="1000"} 0
+histogram_baz_bucket{A="B",C="D",le="25"} 2
+histogram_baz_bucket{A="B",C="D",le="50"} 2
+histogram_baz_bucket{A="B",C="D",le="75"} 2
+histogram_baz_bucket{A="B",C="D",le="100"} 2
+histogram_baz_bucket{A="B",C="D",le="250"} 4
+histogram_baz_bucket{A="B",C="D",le="500"} 4
+histogram_baz_bucket{A="B",C="D",le="1000"} 4
 histogram_baz_bucket{A="B",C="D",le="+Inf"} 4
 histogram_baz_sum{A="B",C="D"} 236
 histogram_baz_count{A="B",C="D"} 4
diff --git a/exporters/prometheus/testdata/sanitized_names.txt b/exporters/prometheus/testdata/sanitized_names.txt
@@ -13,17 +13,17 @@ invalid_hist_name_bucket{A="B",C="D",le="0"} 0
 invalid_hist_name_bucket{A="B",C="D",le="5"} 0
 invalid_hist_name_bucket{A="B",C="D",le="10"} 0
 invalid_hist_name_bucket{A="B",C="D",le="25"} 1
-invalid_hist_name_bucket{A="B",C="D",le="50"} 0
-invalid_hist_name_bucket{A="B",C="D",le="75"} 0
-invalid_hist_name_bucket{A="B",C="D",le="100"} 0
-invalid_hist_name_bucket{A="B",C="D",le="250"} 0
-invalid_hist_name_bucket{A="B",C="D",le="500"} 0
-invalid_hist_name_bucket{A="B",C="D",le="750"} 0
-invalid_hist_name_bucket{A="B",C="D",le="1000"} 0
-invalid_hist_name_bucket{A="B",C="D",le="2500"} 0
-invalid_hist_name_bucket{A="B",C="D",le="5000"} 0
-invalid_hist_name_bucket{A="B",C="D",le="7500"} 0
-invalid_hist_name_bucket{A="B",C="D",le="10000"} 0
+invalid_hist_name_bucket{A="B",C="D",le="50"} 1
+invalid_hist_name_bucket{A="B",C="D",le="75"} 1
+invalid_hist_name_bucket{A="B",C="D",le="100"} 1
+invalid_hist_name_bucket{A="B",C="D",le="250"} 1
+invalid_hist_name_bucket{A="B",C="D",le="500"} 1
+invalid_hist_name_bucket{A="B",C="D",le="750"} 1
+invalid_hist_name_bucket{A="B",C="D",le="1000"} 1
+invalid_hist_name_bucket{A="B",C="D",le="2500"} 1
+invalid_hist_name_bucket{A="B",C="D",le="5000"} 1
+invalid_hist_name_bucket{A="B",C="D",le="7500"} 1
+invalid_hist_name_bucket{A="B",C="D",le="10000"} 1
 invalid_hist_name_bucket{A="B",C="D",le="+Inf"} 1
 invalid_hist_name_sum{A="B",C="D"} 23
 invalid_hist_name_count{A="B",C="D"} 1