Skip to content

Enable race detection in make test #207

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

Closed
jmacd wants to merge 8 commits into from
Closed

Enable race detection in make test #207

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aeb9c31
Avoid test races
jmacd May 31, 2024
6381413
enable race detection in ci/cd
jmacd May 31, 2024
3378b31
use defer
jmacd May 31, 2024
dcc86c9
skip batching 0-size requests; use int64 for totalCount
jmacd May 31, 2024
21821db
make stats concurrent-safe
jmacd May 31, 2024
61626ba
Fix build
jmacd May 31, 2024
de1d44c
parallelize tests
jmacd May 31, 2024
1d69216
Merge branch 'main' into jmacd/cbp_races
jmacd May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ BUILD_INFO_IMPORT_PATH=go.opentelemetry.io/collector/internal/version
all: gotidy test build

test:
for dir in $(GODIRS); do (cd $${dir}; $(GOCMD) test --tags=assert ./...) || exit 1; done
for dir in $(GODIRS); do (cd $${dir}; $(GOCMD) test -race --tags=assert ./...) || exit 1; done

fmt:
for dir in $(GODIRS); do (cd $${dir}; $(GOCMD) fmt ./...) || exit 1; done
Expand Down
8 changes: 4 additions & 4 deletions collector/processor/concurrentbatchprocessor/batch_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func TestBatchProcessorSpansPanicRecover(t *testing.T) {
// until batch size reached to unblock.
wg.Add(1)
go func() {
err = bp.ConsumeTraces(context.Background(), td)
err := bp.ConsumeTraces(context.Background(), td)
assert.Contains(t, err.Error(), "testing panic")
wg.Done()
}()
Expand Down Expand Up @@ -168,7 +168,7 @@ func TestBatchProcessorMetricsPanicRecover(t *testing.T) {
md.ResourceMetrics().At(0).CopyTo(sentResourceMetrics.AppendEmpty())
wg.Add(1)
go func() {
err = bp.ConsumeMetrics(context.Background(), md)
err := bp.ConsumeMetrics(context.Background(), md)
assert.Contains(t, err.Error(), "testing panic")
wg.Done()
}()
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestBatchProcessorLogsPanicRecover(t *testing.T) {
ld.ResourceLogs().At(0).CopyTo(sentResourceLogs.AppendEmpty())
wg.Add(1)
go func() {
err = bp.ConsumeLogs(context.Background(), ld)
err := bp.ConsumeLogs(context.Background(), ld)
assert.Contains(t, err.Error(), "testing panic")
wg.Done()
}()
Expand Down Expand Up @@ -307,7 +307,7 @@ func TestBatchProcessorCancelContext(t *testing.T) {
// until batch size reached to unblock.
wg.Add(1)
go func() {
err = bp.ConsumeTraces(ctx, td)
err := bp.ConsumeTraces(ctx, td)
assert.Contains(t, err.Error(), "context canceled")
wg.Done()
}()
Expand Down