Minor cleanup work from PR review

Author: dricross

go.mod

@@ -6,8 +6,6 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2025
 
 replace collectd.org v0.4.0 => github.com/collectd/go-collectd v0.4.0
 
-replace code.cloudfoundry.org/clock => github.com/cloudfoundry/clock v1.0.0
-
 // Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters
 // to be all replaced since there are some changes that will always be from upstream
 replace (

go.sum

@@ -46,6 +46,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o=
+code.cloudfoundry.org/clock v1.0.0/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
 dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -398,8 +400,6 @@ github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5P
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/cloudfoundry/clock v1.0.0 h1:eKdoEckIniCXbwfL4u5BV+8TTiv/zkWLr8OdEfdkfJY=
-github.com/cloudfoundry/clock v1.0.0/go.mod h1:JXXHhAXLubRvUw6+f17a/0eNz6cQ85bkgYaiQA0Cm6M=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=

metric/distribution/exph/exph.go

@@ -93,7 +93,7 @@ func (d *ExpHistogramDistribution) ValuesAndCounts() ([]float64, []float64) {
 		counts = append(counts, float64(d.zeroCount))
 	}
 
-	// iterate through negative buckets in ascending order
+	// iterate through negative buckets in ascending order so that the values array is entirely descending
 	negOffsetIndicies := slices.Sorted(maps.Keys(d.negativeBuckets))
 	for _, offsetIndex := range negOffsetIndicies {
 		counter := d.negativeBuckets[offsetIndex]
@@ -107,13 +107,9 @@ func (d *ExpHistogramDistribution) ValuesAndCounts() ([]float64, []float64) {
 	return values, counts
 }
 
-func (d *ExpHistogramDistribution) AddDistribution(other *ExpHistogramDistribution) {
-	d.AddDistributionWithWeight(other, 1)
-}
-
-func (d *ExpHistogramDistribution) AddDistributionWithWeight(from *ExpHistogramDistribution, weight float64) {
-	if from.SampleCount()*weight <= 0 {
-		log.Printf("D! SampleCount * Weight should be larger than 0: %v, %v", from.SampleCount(), weight)
+func (d *ExpHistogramDistribution) AddDistribution(from *ExpHistogramDistribution) {
+	if from.SampleCount() <= 0 {
+		log.Printf("D! SampleCount should be larger than 0: %v", from.SampleCount())
 		return
 	}
 
@@ -131,8 +127,8 @@ func (d *ExpHistogramDistribution) AddDistributionWithWeight(from *ExpHistogramD
 
 	d.max = max(d.max, from.Maximum())
 	d.min = min(d.min, from.Minimum())
-	d.sampleCount += from.SampleCount() * weight
-	d.sum += from.Sum() * weight
+	d.sampleCount += from.SampleCount()
+	d.sum += from.Sum()
 
 	for i := range from.positiveBuckets {
 		d.positiveBuckets[i] += from.positiveBuckets[i]

metric/distribution/exph/mapping.go

@@ -7,28 +7,6 @@ package exph
 
 import "math"
 
-// MapToIndexScale0 computes a bucket index at scale 0.
-func MapToIndexScale0(value float64) int {
-	// Note: Frexp() rounds submnormal values to the smallest normal
-	// value and returns an exponent corresponding to fractions in the
-	// range [0.5, 1), whereas an exponent for the range [1, 2), so
-	// subtract 1 from the exponent immediately.
-	frac, exp := math.Frexp(value)
-	exp--
-
-	if frac == 0.5 && value > 0 {
-		// Special case for positive powers of two: they fall into the bucket
-		// numbered one less.
-		exp--
-	}
-	return exp
-}
-
-// MapToIndexNegativeScale computes a bucket index for scales <= 0.
-func MapToIndexNegativeScale(value float64, scale int) int {
-	return MapToIndexScale0(value) >> -scale
-}
-
 // MapToIndex for any scale
 //
 // Values near a boundary could be mapped into the incorrect bucket due to float point calculation inaccuracy.

metric/distribution/exph/mapping_test.go

@@ -54,87 +54,6 @@ func TestMapToIndexPositiveScale(t *testing.T) {
 
 }
 
-func TestMapToIndexScale0(t *testing.T) {
-	tests := []struct {
-		name     string
-		values   []float64
-		expected []int
-	}{
-		{
-			name:     "positive value inside bucket",
-			values:   []float64{1.5, 3.0, 6, 12, 18},
-			expected: []int{0, 1, 2, 3, 4},
-		},
-		{
-			// for negative values, histogram buckets use lower-inclusive boundaries
-			name:     "positive value is on boundary",
-			values:   []float64{2, 4, 8, 16.0, 32},
-			expected: []int{0, 1, 2, 3, 4},
-		},
-		{
-			name:     "negative value inside bucket",
-			values:   []float64{-1.5, -3.0, -6, -12, -18},
-			expected: []int{0, 1, 2, 3, 4},
-		},
-		{
-			// for negative values, histogram buckets use lower-inclusive boundaries
-			name:     "negative value is on boundary",
-			values:   []float64{-2, -4, -8, -16, -32},
-			expected: []int{1, 2, 3, 4, 5},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for i, value := range tt.values {
-				assert.Equal(t, tt.expected[i], MapToIndexNegativeScale(value, 0), "expected value %f to map to index %d with scale 0", value, tt.expected[i])
-			}
-		})
-	}
-}
-
-func TestMapToIndexNegativeScale(t *testing.T) {
-	tests := []struct {
-		name     string
-		scale    int
-		values   []float64
-		expected []int
-	}{
-		{
-			name:     "positive value inside bucket",
-			scale:    -1,
-			values:   []float64{1.5, 5.0, 32, 80, 500, 2000},
-			expected: []int{0, 1, 2, 3, 4, 5},
-		},
-		{
-			// for positive values, histogram buckets use upper-inclusive boundaries
-			name:     "positive value is on boundary",
-			scale:    -1,
-			values:   []float64{4, 16, 64, 256, 1024},
-			expected: []int{0, 1, 2, 3, 4, 5},
-		},
-		{
-			name:     "negative value inside bucket",
-			scale:    -1,
-			values:   []float64{-1.5, -5.0, -32, -80, -500, -2000},
-			expected: []int{0, 1, 2, 3, 4, 5},
-		},
-		{
-			// for negative values, histogram buckets use lower-inclusive boundaries
-			name:     "negative value is on boundary",
-			scale:    -1,
-			values:   []float64{-1, -4, -16, -64, -256, -1024},
-			expected: []int{0, 1, 2, 3, 4, 5, 6},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for i, value := range tt.values {
-				assert.Equal(t, tt.expected[i], MapToIndexNegativeScale(value, tt.scale), "expected value %f to map to index %d with scale %d", value, tt.expected[i], tt.scale)
-			}
-		})
-	}
-}
-
 func TestLowerBoundary(t *testing.T) {
 	// scale = 1, base = 2^(1/2) or sqrt(2) = 1.41421
 	assert.InDelta(t, 1.41421, LowerBoundary(1, 1), 0.01) // 2^(1/2)