remove bin and sum

Author: dashpole

sdk/metric/internal/aggregate/histogram.go

@@ -39,18 +39,6 @@ type histogramPointCounters[N int64 | float64] struct {
 	minMax atomicMinMax[N]
 }
 
-func (b *histogramPointCounters[N]) sum(value N) { b.total.add(value) }
-
-func (b *histogramPointCounters[N]) bin(bounds []float64, value N) {
-	// This search will return an index in the range [0, len(s.bounds)], where
-	// it will return len(s.bounds) if value is greater than the last element
-	// of s.bounds. This aligns with the histogramPoint in that the length of histogramPoint
-	// is len(s.bounds)+1, with the last bucket representing:
-	// (s.bounds[len(s.bounds)-1], +∞).
-	idx := sort.SearchFloat64s(bounds, float64(value))
-	b.counts[idx].Add(1)
-}
-
 func (b *histogramPointCounters[N]) loadCountsInto(into *[]uint64) uint64 {
 	// TODO (#3047): Making copies for bounds and counts incurs a large
 	// memory allocation footprint. Alternatives should be explored.
@@ -138,12 +126,18 @@ func (s *deltaHistogram[N]) measure(
 		return hPt
 	}).(*histogramPoint[N])
 
-	h.bin(s.bounds, value)
+	// This search will return an index in the range [0, len(s.bounds)], where
+	// it will return len(s.bounds) if value is greater than the last element
+	// of s.bounds. This aligns with the histogramPoint in that the length of histogramPoint
+	// is len(s.bounds)+1, with the last bucket representing:
+	// (s.bounds[len(s.bounds)-1], +∞).
+	idx := sort.SearchFloat64s(s.bounds, float64(value))
+	h.counts[idx].Add(1)
 	if !s.noMinMax {
 		h.minMax.Update(value)
 	}
 	if !s.noSum {
-		h.sum(value)
+		h.total.add(value)
 	}
 	h.res.Offer(ctx, value, droppedAttr)
 }
@@ -311,12 +305,18 @@ func (s *cumulativeHistogram[N]) measure(
 	hotIdx := h.hcwg.start()
 	defer h.hcwg.done(hotIdx)
 
-	h.hotColdPoint[hotIdx].bin(s.bounds, value)
+	// This search will return an index in the range [0, len(s.bounds)], where
+	// it will return len(s.bounds) if value is greater than the last element
+	// of s.bounds. This aligns with the histogramPoint in that the length of histogramPoint
+	// is len(s.bounds)+1, with the last bucket representing:
+	// (s.bounds[len(s.bounds)-1], +∞).
+	idx := sort.SearchFloat64s(s.bounds, float64(value))
+	h.hotColdPoint[hotIdx].counts[idx].Add(1)
 	if !s.noMinMax {
 		h.hotColdPoint[hotIdx].minMax.Update(value)
 	}
 	if !s.noSum {
-		h.hotColdPoint[hotIdx].sum(value)
+		h.hotColdPoint[hotIdx].total.add(value)
 	}
 	h.res.Offer(ctx, value, droppedAttr)
 }

sdk/metric/internal/aggregate/histogram_test.go

@@ -339,63 +339,6 @@ func hPoint[N int64 | float64](
 	}
 }
 
-func TestBucketsBin(t *testing.T) {
-	t.Run("Int64", testBucketsBin[int64]())
-	t.Run("Float64", testBucketsBin[float64]())
-}
-
-func testBucketsBin[N int64 | float64]() func(t *testing.T) {
-	return func(t *testing.T) {
-		b := newHistogramPoint[N](alice, 3)
-		assertB := func(expectedBucketCounts []uint64, expectedCount uint64, mi, ma N) {
-			t.Helper()
-			var bucketCounts []uint64
-			count := b.loadCountsInto(&bucketCounts)
-			assert.Equal(t, expectedBucketCounts, bucketCounts)
-			assert.Equal(t, expectedCount, count)
-			if mi != 0 {
-				assert.True(t, b.minMax.set.Load())
-				assert.Equal(t, mi, b.minMax.minimum.Load())
-			}
-			if ma != 0 {
-				assert.True(t, b.minMax.set.Load())
-				assert.Equal(t, ma, b.minMax.maximum.Load())
-			}
-		}
-
-		bounds := []float64{0, 2, 4}
-		assertB([]uint64{0, 0, 0}, 0, 0, 0)
-		b.bin(bounds, 1)
-		b.minMax.Update(2)
-		assertB([]uint64{0, 1, 0}, 1, 0, 2)
-		b.bin(bounds, -1)
-		b.minMax.Update(-1)
-		assertB([]uint64{1, 1, 0}, 2, -1, 2)
-	}
-}
-
-func TestBucketsSum(t *testing.T) {
-	t.Run("Int64", testBucketsSum[int64]())
-	t.Run("Float64", testBucketsSum[float64]())
-}
-
-func testBucketsSum[N int64 | float64]() func(t *testing.T) {
-	return func(t *testing.T) {
-		b := newHistogramPoint[N](alice, 3)
-
-		var want N
-		assert.Equal(t, want, b.total.load())
-
-		b.sum(2)
-		want = 2
-		assert.Equal(t, want, b.total.load())
-
-		b.sum(-1)
-		want = 1
-		assert.Equal(t, want, b.total.load())
-	}
-}
-
 func TestHistogramImmutableBounds(t *testing.T) {
 	b := []float64{0, 1, 2}
 	cpB := make([]float64, len(b))