Skip to content

chore: enable shuffle testing for contrib packages #4065

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

chore: enable shuffle testing for contrib packages #4065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dcec1a
fix(contrib slog/logrus): fix for shuffle testing
felixge Oct 25, 2025
4ad9904
fix(contrib/gin): fix TestServiceName test ordering issue
felixge Oct 25, 2025
af313cc
chore(contrib): enable shuffle testing
felixge Oct 23, 2025
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
4 changes: 4 additions & 0 deletions contrib/gin-gonic/gin/gintrace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,10 @@ func TestServiceName(t *testing.T) {
// TestTracerStartedMultipleTimes tests a v2 regression where the global service name was being set to an empty string
// when the tracer is started more than once.
func TestTracerStartedMultipleTimes(t *testing.T) {
// tracer.WithService below overwrites the global service name, this call
// ensures we restore it its previous value after this test finishes.
testutils.SetGlobalServiceName(t, "")

tt1 := testtracer.Start(t)
defer tt1.Stop()
tt2 := testtracer.Start(t, testtracer.WithTracerStartOpts(tracer.WithService("global_service")))
Expand Down
2 changes: 2 additions & 0 deletions contrib/log/slog/slog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func testLogger(t *testing.T, createLogger func(b io.Writer) *slog.Logger, asser
spanID := strconv.FormatUint(span.Context().SpanID(), 10)
if os.Getenv("DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED") == "false" {
// Re-initialize to account for race condition between setting env var in the test and reading it in the contrib
oldCfg := cfg
t.Cleanup(func() { cfg = oldCfg })
cfg = newConfig()
traceID = strconv.FormatUint(span.Context().TraceIDLower(), 10)
} else {
Expand Down
2 changes: 2 additions & 0 deletions contrib/sirupsen/logrus/logrus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ func TestFire128BitDisabled(t *testing.T) {
t.Setenv("DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED", "false")

// Re-initialize to account for race condition between setting env var in the test and reading it in the contrib
oldCfg := cfg
t.Cleanup(func() { cfg = oldCfg })
cfg = newConfig()

tracer.Start()
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci_test_contrib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ for contrib in $CONTRIBS; do
go get k8s.io/[email protected]
fi
go mod tidy
gotestsum --junitfile "${TEST_RESULTS}/gotestsum-report-$contrib_id.xml" -- ./... -v -race -coverprofile="coverage-$contrib_id.txt" -covermode=atomic
gotestsum --junitfile "${TEST_RESULTS}/gotestsum-report-$contrib_id.xml" -- ./... -v -race -coverprofile="coverage-$contrib_id.txt" -covermode=atomic --shuffle=on
test_exit=$?
[[ $test_exit -ne 0 ]] && report_error=1
cd - > /dev/null || exit 1
Expand All @@ -58,7 +58,7 @@ for mod in $INSTRUMENTATION_SUBMODULES; do
# When the issue is resolved, this line can be removed.
go get k8s.io/[email protected]
fi
gotestsum --junitfile "${TEST_RESULTS}/gotestsum-report-$mod_id.xml" -- ./... -v -race -coverprofile="coverage-$mod_id.txt" -covermode=atomic
gotestsum --junitfile "${TEST_RESULTS}/gotestsum-report-$mod_id.xml" -- ./... -v -race -coverprofile="coverage-$mod_id.txt" -covermode=atomic --shuffle=on
test_exit=$?
[[ $test_exit -ne 0 ]] && report_error=1
cd - > /dev/null || exit 1
Expand Down
Loading