@@ -468,15 +468,17 @@ func TestPeriodicMetrics(t *testing.T) {
468
468
go em .periodicMetrics ()
469
469
470
470
// ensure our gauge is showing 1 item in the queue
471
- assert .Eventually (t , func () bool {
472
- return getGaugeValue (t , "otelcol_processor_groupbytrace_num_events_in_queue" , s ) == 1
471
+ assert .EventuallyWithT (t , func (tt * assert.CollectT ) {
472
+ val := getGaugeValue (t .Context (), tt , "otelcol_processor_groupbytrace_num_events_in_queue" , s )
473
+ assert .Equal (tt , int64 (1 ), val )
473
474
}, 1 * time .Second , 10 * time .Millisecond )
474
475
475
476
wg .Done () // release all events
476
477
477
478
// ensure our gauge is now showing no items in the queue
478
- assert .Eventually (t , func () bool {
479
- return getGaugeValue (t , "otelcol_processor_groupbytrace_num_events_in_queue" , s ) == 0
479
+ assert .EventuallyWithT (t , func (tt * assert.CollectT ) {
480
+ val := getGaugeValue (t .Context (), tt , "otelcol_processor_groupbytrace_num_events_in_queue" , s )
481
+ assert .Equal (tt , int64 (0 ), val )
480
482
}, 1 * time .Second , 10 * time .Millisecond )
481
483
482
484
// signal and wait for the recursive call to finish
@@ -534,12 +536,17 @@ func TestDoWithTimeout_TimeoutTrigger(t *testing.T) {
534
536
assert .WithinDuration (t , start , time .Now (), 100 * time .Millisecond )
535
537
}
536
538
537
- func getGaugeValue (t * testing. T , name string , tt testTelemetry ) int64 {
539
+ func getGaugeValue (ctx context. Context , t * assert. CollectT , name string , tt testTelemetry ) int64 {
538
540
var md metricdata.ResourceMetrics
539
- require .NoError (t , tt .reader .Collect (t . Context () , & md ))
541
+ require .NoError (t , tt .reader .Collect (ctx , & md ))
540
542
m := tt .getMetric (name , md ).Data
541
- g := m .(metricdata.Gauge [int64 ])
542
- assert .Len (t , g .DataPoints , 1 , "expected exactly one data point" )
543
+ var g metricdata.Gauge [int64 ]
544
+ var ok bool
545
+ if g , ok = m .(metricdata.Gauge [int64 ]); ! ok {
546
+ assert .Fail (t , "missing gauge data" )
547
+ } else {
548
+ assert .Len (t , g .DataPoints , 1 , "expected exactly one data point" )
549
+ }
543
550
return g .DataPoints [0 ].Value
544
551
}
545
552
0 commit comments