Fix classic histogram definition

dricross · dricross · commit 6ba4b80f60ec · 2025-10-29T16:07:10.000-04:00
diff --git a/test/histograms/histograms_to_cw_test.go b/test/histograms/histograms_to_cw_test.go
@@ -151,49 +151,49 @@ func (t *OtlpHistogramTestRunner) validateHistogramMetric(metricName string) []s
 			},
 			{
 				stat:  types.StatisticMaximum,
-				value: 2,
+				value: 4,
 			},
 			{
 				stat:  types.StatisticSum,
-				value: 24,
+				value: 36,
 			},
 			{
 				stat:  types.StatisticAverage,
-				value: 2,
+				value: 1.5,
 			},
 			{
 				stat:  types.StatisticSampleCount,
-				value: 12,
+				value: 24,
 			},
 			{
 				stat:  "p90",
-				value: 2.0,
+				value: 3.9,
 			},
 		},
 		"my.cumulative.histogram": {
 			{
 				stat:  types.StatisticMinimum,
-				value: 0,
+				value: 0.5,
 			},
 			{
 				stat:  types.StatisticMaximum,
 				value: 2,
 			},
 			{
 				stat:  types.StatisticSum,
-				value: 24,
+				value: 12,
 			},
 			{
 				stat:  types.StatisticAverage,
-				value: 2,
+				value: 1,
 			},
 			{
 				stat:  types.StatisticSampleCount,
 				value: 12,
 			},
 			{
 				stat:  "p90",
-				value: 2.0,
+				value: 1.3,
 			},
 		},
 		"my.delta.exponential.histogram": {
diff --git a/test/histograms/histograms_to_emf_test.go b/test/histograms/histograms_to_emf_test.go
@@ -64,11 +64,11 @@ func TestOTLPMetrics(t *testing.T) {
 				},
 				{
 					stat:  types.StatisticMaximum,
-					value: 2,
+					value: 4,
 				},
 				{
 					stat:  types.StatisticSum,
-					value: 12, // we send Sum=2 six times in one minute
+					value: 36, // we send Sum=2 six times in one minute
 				},
 				{
 					stat:  types.StatisticAverage,
@@ -110,7 +110,7 @@ func TestOTLPMetrics(t *testing.T) {
 				},
 				{
 					stat:  types.StatisticSum,
-					value: 12, // we send Sum=2 six times in one minute
+					value: 36, // we send Sum=2 six times in one minute
 				},
 				{
 					stat:  types.StatisticAverage,
@@ -216,12 +216,12 @@ func TestOTLPMetrics(t *testing.T) {
 			for _, e := range m.expected {
 				values, err := fetcher.Fetch(namespace, m.name, m.dimensions, e.stat, metric.MinuteStatPeriod)
 				require.NoError(t, err)
-				require.GreaterOrEqual(t, len(values), 3, "Not enough metrics retrieved for namespace {%s} metric Name {%s} stat {%s}", namespace, m.name, e.stat)
+				assert.GreaterOrEqual(t, len(values), 3, "Not enough metrics retrieved for namespace {%s} metric Name {%s} stat {%s}", namespace, m.name, e.stat)
 
 				// omit first/last metric as the 1m collection intervals may be missing data points from when the agent was started/stopped
 				middleValues := values[1 : len(values)-1]
 				err = metric.IsAllValuesGreaterThanOrEqualToExpectedValueWithError(m.name, middleValues, e.value)
-				require.NoError(t, err)
+				assert.NoError(t, err)
 			}
 		})
 	}
diff --git a/test/histograms/resources/otlp_emf_metrics.json b/test/histograms/resources/otlp_emf_metrics.json
@@ -36,12 +36,12 @@
                   {
                     "startTimeUnixNano": METRIC_TIME,
                     "timeUnixNano": METRIC_TIME,
-                    "count": 2,
-                    "sum": 2,
-                    "bucketCounts": [0,2],
-                    "explicitBounds": [1,2],
+                    "count": 4,
+                    "sum": 6,
+                    "bucketCounts": [1,2,1],
+                    "explicitBounds": [0.5,2],
                     "min": 0,
-                    "max": 2,
+                    "max": 4,
                     "attributes": [
                       {
                         "key": "my.delta.histogram.attr",
@@ -72,10 +72,10 @@
                     "timeUnixNano": METRIC_TIME,
                     "count": CUMULATIVE_HIST_COUNT,
                     "sum": CUMULATIVE_HIST_SUM,
-                    "bucketCounts": [0,CUMULATIVE_HIST_COUNT],
-                    "explicitBounds": [1, 2],
+                    "bucketCounts": [1,CUMULATIVE_HIST_COUNT,1],
+                    "explicitBounds": [0.5,2],
                     "min": 0,
-                    "max": 2,
+                    "max": 4,
                     "attributes": [
                       {
                         "key": "my.cumulative.histogram.attr",
diff --git a/test/histograms/resources/otlp_emf_pusher.sh b/test/histograms/resources/otlp_emf_pusher.sh
@@ -7,16 +7,18 @@ fi
 echo "Starting with INSTANCE_ID: $INSTANCE_ID"
 
 INITIAL_METRIC_TIME=$(date +%s%N)
-COUNT=0
+COUNT=2
 
 # Initialize the file
 cat ./resources/otlp_emf_metrics.json | sed -e "s/INITIAL_METRIC_TIME/$INITIAL_METRIC_TIME/" \
     -e "s/\$INSTANCE_ID/$INSTANCE_ID/g" > ./resources/otlp_emf_metrics_initial.json
 
 while true; do
     METRIC_TIME=$(date +%s%N)
+
+    # Simulating a histogram with datapoints 0 and 4, and then adding 2 counts of value 1 for each iteration
     COUNT=$((COUNT + 2))
-    SUM=$((COUNT))
+    SUM=$((COUNT+4))
 
     cat ./resources/otlp_emf_metrics_initial.json | \
         sed -e "s/METRIC_TIME/$METRIC_TIME/" \
diff --git a/test/histograms/resources/otlp_metrics.json b/test/histograms/resources/otlp_metrics.json
@@ -105,12 +105,12 @@
                   {
                     "startTimeUnixNano": INITIAL_METRIC_TIME,
                     "timeUnixNano": METRIC_TIME,
-                    "count": 2,
-                    "sum": 2,
-                    "bucketCounts": [0,2],
-                    "explicitBounds": [1,2],
+                    "count": 4,
+                    "sum": 6,
+                    "bucketCounts": [1,2,1],
+                    "explicitBounds": [0.5,2],
                     "min": 0,
-                    "max": 2,
+                    "max": 4,
                     "attributes": [
                       {
                         "key": "my.delta.histogram.attr",
@@ -135,10 +135,10 @@
                     "timeUnixNano": METRIC_TIME,
                     "count": CUMULATIVE_HIST_COUNT,
                     "sum": CUMULATIVE_HIST_SUM,
-                    "bucketCounts": [0,CUMULATIVE_HIST_COUNT],
-                    "explicitBounds": [1, 2],
+                    "bucketCounts": [1,CUMULATIVE_HIST_COUNT,1],
+                    "explicitBounds": [0.5,2],
                     "min": 0,
-                    "max": 2,
+                    "max": 3,
                     "attributes": [
                       {
                         "key": "my.cumulative.histogram.attr",
diff --git a/test/histograms/resources/otlp_pusher.sh b/test/histograms/resources/otlp_pusher.sh
@@ -1,13 +1,15 @@
 INITIAL_METRIC_TIME=$(date +%s%N)
-COUNT=0
+COUNT=2
 
 # Initialize the file
 cat ./resources/otlp_metrics.json | sed -e "s/INITIAL_METRIC_TIME/$INITIAL_METRIC_TIME/" > ./resources/otlp_metrics_initial.json;
 
 while true; do
   METRIC_TIME=$(date +%s%N)
-  COUNT=$((COUNT + 2))  # Increment count by 2 each iteration
-  SUM=$((COUNT))
+
+  # Simulating a histogram with datapoints 0 and 3, and then adding 2 counts of value 1 for each iteration
+  COUNT=$((COUNT + 2))
+  SUM=$((COUNT+4))
 
   cat ./resources/otlp_metrics_initial.json | sed -e "s/METRIC_TIME/$METRIC_TIME/" > otlp_metrics.json;
   sed -i -e "s/CUMULATIVE_HIST_COUNT/$COUNT/" otlp_metrics.json;

Original file line number	Diff line number	Diff line change
`@@ -151,49 +151,49 @@ func (t *OtlpHistogramTestRunner) validateHistogramMetric(metricName string) []s`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`stat: types.StatisticMaximum,`
`154`		`- value: 2,`
	`154`	`+ value: 4,`
`155`	`155`	`},`
`156`	`156`	`{`
`157`	`157`	`stat: types.StatisticSum,`
`158`		`- value: 24,`
	`158`	`+ value: 36,`
`159`	`159`	`},`
`160`	`160`	`{`
`161`	`161`	`stat: types.StatisticAverage,`
`162`		`- value: 2,`
	`162`	`+ value: 1.5,`
`163`	`163`	`},`
`164`	`164`	`{`
`165`	`165`	`stat: types.StatisticSampleCount,`
`166`		`- value: 12,`
	`166`	`+ value: 24,`
`167`	`167`	`},`
`168`	`168`	`{`
`169`	`169`	`stat: "p90",`
`170`		`- value: 2.0,`
	`170`	`+ value: 3.9,`
`171`	`171`	`},`
`172`	`172`	`},`
`173`	`173`	`"my.cumulative.histogram": {`
`174`	`174`	`{`
`175`	`175`	`stat: types.StatisticMinimum,`
`176`		`- value: 0,`
	`176`	`+ value: 0.5,`
`177`	`177`	`},`
`178`	`178`	`{`
`179`	`179`	`stat: types.StatisticMaximum,`
`180`	`180`	`value: 2,`
`181`	`181`	`},`
`182`	`182`	`{`
`183`	`183`	`stat: types.StatisticSum,`
`184`		`- value: 24,`
	`184`	`+ value: 12,`
`185`	`185`	`},`
`186`	`186`	`{`
`187`	`187`	`stat: types.StatisticAverage,`
`188`		`- value: 2,`
	`188`	`+ value: 1,`
`189`	`189`	`},`
`190`	`190`	`{`
`191`	`191`	`stat: types.StatisticSampleCount,`
`192`	`192`	`value: 12,`
`193`	`193`	`},`
`194`	`194`	`{`
`195`	`195`	`stat: "p90",`
`196`		`- value: 2.0,`
	`196`	`+ value: 1.3,`
`197`	`197`	`},`
`198`	`198`	`},`
`199`	`199`	`"my.delta.exponential.histogram": {`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ func TestOTLPMetrics(t *testing.T) {`
`64`	`64`	`},`
`65`	`65`	`{`
`66`	`66`	`stat: types.StatisticMaximum,`
`67`		`- value: 2,`
	`67`	`+ value: 4,`
`68`	`68`	`},`
`69`	`69`	`{`
`70`	`70`	`stat: types.StatisticSum,`
`71`		`- value: 12, // we send Sum=2 six times in one minute`
	`71`	`+ value: 36, // we send Sum=2 six times in one minute`
`72`	`72`	`},`
`73`	`73`	`{`
`74`	`74`	`stat: types.StatisticAverage,`
`@@ -110,7 +110,7 @@ func TestOTLPMetrics(t *testing.T) {`
`110`	`110`	`},`
`111`	`111`	`{`
`112`	`112`	`stat: types.StatisticSum,`
`113`		`- value: 12, // we send Sum=2 six times in one minute`
	`113`	`+ value: 36, // we send Sum=2 six times in one minute`
`114`	`114`	`},`
`115`	`115`	`{`
`116`	`116`	`stat: types.StatisticAverage,`
`@@ -216,12 +216,12 @@ func TestOTLPMetrics(t *testing.T) {`
`216`	`216`	`for _, e := range m.expected {`
`217`	`217`	`values, err := fetcher.Fetch(namespace, m.name, m.dimensions, e.stat, metric.MinuteStatPeriod)`
`218`	`218`	`require.NoError(t, err)`
`219`		`- require.GreaterOrEqual(t, len(values), 3, "Not enough metrics retrieved for namespace {%s} metric Name {%s} stat {%s}", namespace, m.name, e.stat)`
	`219`	`+ assert.GreaterOrEqual(t, len(values), 3, "Not enough metrics retrieved for namespace {%s} metric Name {%s} stat {%s}", namespace, m.name, e.stat)`
`220`	`220`
`221`	`221`	`// omit first/last metric as the 1m collection intervals may be missing data points from when the agent was started/stopped`
`222`	`222`	`middleValues := values[1 : len(values)-1]`
`223`	`223`	`err = metric.IsAllValuesGreaterThanOrEqualToExpectedValueWithError(m.name, middleValues, e.value)`
`224`		`- require.NoError(t, err)`
	`224`	`+ assert.NoError(t, err)`
`225`	`225`	`}`
`226`	`226`	`})`
`227`	`227`	`}`