Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] Remove redundant wait group from a test #10269

Merged
merged 2 commits into from
May 30, 2024
Merged

[chore] Remove redundant wait group from a test #10269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f2938
[chore] Remove redundant wait group from a test
dmitryax May 30, 2024
435fb3f
Merge branch 'main' into remove-redundant-wg
codeboten May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 8 additions & 18 deletions exporter/exporterhelper/batch_sender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,10 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) {
waitMerge := make(chan struct{}, 10)

// blockedBatchMergeFunc blocks until the blockMerge channel is closed
blockedBatchMergeFunc := func(_ context.Context, r1 Request, _ Request) (Request, error) {
blockedBatchMergeFunc := func(_ context.Context, r1 Request, r2 Request) (Request, error) {
waitMerge <- struct{}{}
<-blockMerge
r1.(*fakeRequest).items += r2.(*fakeRequest).items
return r1, nil
}

Expand All @@ -458,18 +459,11 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) {

sink := newFakeRequestSink()

// Send 10 concurrent requests and wait for them to start
startWG := sync.WaitGroup{}
for i := 0; i < 10; i++ {
startWG.Add(1)
go func() {
startWG.Done()
require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink}))
}()
}
startWG.Wait()
// Send 2 concurrent requests
go func() { require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) }()
go func() { require.NoError(t, be.send(context.Background(), &fakeRequest{items: 4, sink: sink})) }()

// Wait for at least one batch to enter the merge function
// Wait for the requests to enter the merge function
<-waitMerge

// Initiate the exporter shutdown, unblock the batch merge function to catch possible deadlocks,
Expand All @@ -485,12 +479,8 @@ func TestBatchSender_ShutdownDeadlock(t *testing.T) {
close(blockMerge)
<-doneShutdown

// The exporter should have sent only one "merged" batch, in some cases it might send two if the shutdown
// happens before the batch is fully merged.
assert.LessOrEqual(t, uint64(1), sink.requestsCount.Load())

// blockedBatchMergeFunc just returns the first request, so the items count should be 4 times the requests count.
assert.Equal(t, sink.requestsCount.Load()*4, sink.itemsCount.Load())
assert.EqualValues(t, 1, sink.requestsCount.Load())
assert.EqualValues(t, 8, sink.itemsCount.Load())
}

func queueBatchExporter(t *testing.T, batchOption Option) *baseExporter {
Expand Down