From 6e29a86662fa74ee6b841f645ebe175a9cef31ed Mon Sep 17 00:00:00 2001 From: Alexa Greenberg Date: Mon, 29 Apr 2024 10:09:19 -0400 Subject: [PATCH] RSDK-6866 - Change context cancelation logging test to use ticker based capture (#3867) --- data/collector_test.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/data/collector_test.go b/data/collector_test.go index 56c2eb60b09..6a908235ca2 100644 --- a/data/collector_test.go +++ b/data/collector_test.go @@ -245,10 +245,10 @@ func TestClose(t *testing.T) { } } -// TestCtxCancelledNotLoggedAfterClose verifies that context cancelled errors are not logged if they occur after Close -// has been called. The collector context is cancelled as part of Close, so we expect to see context cancelled errors -// for any running capture routines. -func TestCtxCancelledNotLoggedAfterClose(t *testing.T) { +// TestCtxCancelledNotLoggedInTickerBasedCaptureAfterClose verifies that context cancelled errors are not logged if they +// occur after Close has been called. The collector context is cancelled as part of Close, so we expect to see context +// cancelled errors for any running capture routines. +func TestCtxCancelledNotLoggedInTickerBasedCaptureAfterClose(t *testing.T) { logger, logs := logging.NewObservedTestLogger(t) tmpDir := t.TempDir() target := datacapture.NewBuffer(tmpDir, &v1.DataCaptureMetadata{}) @@ -264,12 +264,15 @@ func TestCtxCancelledNotLoggedAfterClose(t *testing.T) { params := CollectorParams{ ComponentName: "testComponent", - Interval: time.Millisecond * 1, - MethodParams: map[string]*anypb.Any{"name": fakeVal}, - Target: target, - QueueSize: queueSize, - BufferSize: bufferSize, - Logger: logger, + // Ensure that we use ticker-based capture since capturing at 1000+ Hz + // uses a sleep-based capture that may let a context cancelation error + // occasionally be logged. + Interval: sleepCaptureCutoff + time.Microsecond, + MethodParams: map[string]*anypb.Any{"name": fakeVal}, + Target: target, + QueueSize: queueSize, + BufferSize: bufferSize, + Logger: logger, } c, _ := NewCollector(errorCapturer, params) c.Collect()