add code change and test to address out-of-bound error when comparing…

… bucket boundaries Signed-off-by: xchen <xchen@axon.com>
open-telemetry · Jun 27, 2023 · b2e18ca · b2e18ca
1 parent 98c0090
commit b2e18ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go
@@ -257,7 +257,7 @@ func (a *lastValueAccumulator) accumulateHistogram(metric pmetric.Metric, il pco
 			n++
 			continue
 		}
-		mv := v.(*accumulatedValue) //current accumulated histogram
+		mv := v.(*accumulatedValue)
 
 		m := copyMetricMetadata(metric)
 		m.SetEmptyHistogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative)
@@ -364,7 +364,7 @@ func accumulateHistogramValues(prev, current, dest pmetric.HistogramDataPoint) {
 	// checking for bucket boundary alignment, optionally re-aggregate on newer boundaries
 	match := true
 	if older.ExplicitBounds().Len() == newer.ExplicitBounds().Len() {
-		for i := 0; i < newer.BucketCounts().Len(); i++ {
+		for i := 0; i < newer.ExplicitBounds().Len(); i++ {
 			if older.ExplicitBounds().At(i) != newer.ExplicitBounds().At(i) {
 				match = false
 				break

diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go
@@ -57,8 +57,9 @@ func TestAccumulateHistogram(t *testing.T) {
 	resourceMetrics1 := pmetric.NewResourceMetrics()
 	ilm1 := resourceMetrics1.ScopeMetrics().AppendEmpty()
 	ilm1.Scope().SetName("test")
-	appendHistogram(startTs2, ts3, 5, 2.5, []uint64{1, 3, 1, 0}, []float64{0.1, 0.5, 1, 10}, ilm1.Metrics())
-	appendHistogram(startTs2, ts2, 4, 8.3, []uint64{1, 1, 2, 0}, []float64{0.1, 0.5, 1, 10}, ilm1.Metrics())
+	// counts is one more than explicit bounds to account for the one implicit count/bucket for <=inf
+	appendHistogram(startTs2, ts3, 5, 2.5, []uint64{1, 3, 1, 0, 0}, []float64{0.1, 0.5, 1, 10}, ilm1.Metrics())
+	appendHistogram(startTs2, ts2, 4, 8.3, []uint64{1, 1, 2, 0, 0}, []float64{0.1, 0.5, 1, 10}, ilm1.Metrics())
 
 	m3 := ilm1.Metrics().At(0).Histogram().DataPoints().At(0)
 	m2 := ilm1.Metrics().At(1).Histogram().DataPoints().At(0)
@@ -68,28 +69,28 @@ func TestAccumulateHistogram(t *testing.T) {
 	resourceMetrics2 := pmetric.NewResourceMetrics()
 	ilm2 := resourceMetrics2.ScopeMetrics().AppendEmpty()
 	ilm2.Scope().SetName("test")
-	appendHistogram(startTs2, ts1, 7, 5, []uint64{3, 1, 1, 0}, []float64{0.1, 0.2, 1, 10}, ilm2.Metrics())
+	appendHistogram(startTs2, ts1, 7, 5, []uint64{3, 1, 1, 0, 0}, []float64{0.1, 0.2, 1, 10}, ilm2.Metrics())
 
 	// add extra buckets
 	resourceMetrics3 := pmetric.NewResourceMetrics()
 	ilm3 := resourceMetrics3.ScopeMetrics().AppendEmpty()
 	ilm3.Scope().SetName("test")
-	appendHistogram(startTs2, ts4, 7, 5, []uint64{3, 1, 1, 0, 0}, []float64{0.1, 0.2, 1, 10, 15}, ilm3.Metrics())
+	appendHistogram(startTs2, ts4, 7, 5, []uint64{3, 1, 1, 0, 0, 0}, []float64{0.1, 0.2, 1, 10, 15}, ilm3.Metrics())
 
 	m4 := ilm3.Metrics().At(0).Histogram().DataPoints().At(0)
 
 	// misaligned start timestamp, drop
 	resourceMetrics4 := pmetric.NewResourceMetrics()
 	ilm4 := resourceMetrics4.ScopeMetrics().AppendEmpty()
 	ilm4.Scope().SetName("test")
-	appendHistogram(startTs1, ts5, 4, 8.3, []uint64{1, 1, 2, 0}, []float64{0.1, 0.5, 1, 10}, ilm4.Metrics())
-	appendHistogram(ts3, ts5, 4, 8.3, []uint64{1, 1, 2, 0}, []float64{0.1, 0.5, 1, 10}, ilm4.Metrics())
+	appendHistogram(startTs1, ts5, 4, 8.3, []uint64{1, 1, 2, 0, 0}, []float64{0.1, 0.5, 1, 10}, ilm4.Metrics())
+	appendHistogram(ts3, ts5, 4, 8.3, []uint64{1, 1, 2, 0, 0}, []float64{0.1, 0.5, 1, 10}, ilm4.Metrics())
 
 	// misaligned start timestamp, treat as restart
 	resourceMetrics5 := pmetric.NewResourceMetrics()
 	ilm5 := resourceMetrics5.ScopeMetrics().AppendEmpty()
 	ilm5.Scope().SetName("test")
-	appendHistogram(startTs3, ts5, 4, 8.3, []uint64{1, 1, 2, 0}, []float64{0.1, 0.5, 1, 10}, ilm5.Metrics())
+	appendHistogram(startTs3, ts5, 4, 8.3, []uint64{1, 1, 2, 0, 0}, []float64{0.1, 0.5, 1, 10}, ilm5.Metrics())
 	m5 := ilm5.Metrics().At(0).Histogram().DataPoints().At(0)
 
 	t.Run("Accumulate", func(t *testing.T) {