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

Reduce test flakiness due to resource contention and timing #1017

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Reduce test flakiness due to resource contention and timing #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cc9f62
Reduce test flakiness due to resource contention and timing
andrewa-stripe Dec 16, 2022
f51ccac
go fmt
andrewa-stripe Dec 16, 2022
f5bd32c
Revert "go fmt"
andrewa-stripe Dec 16, 2022
5f861b3
go fmt
andrewa-stripe Dec 16, 2022
5c811ae
This is used for expected fail cases, so use a fake testing.T
andrewa-stripe Dec 16, 2022
d65103b
Merge branch 'master' into reduce-test-flakiness
andrewa-stripe Dec 18, 2022
b4e7878
Merge branch 'master' into reduce-test-flakiness
andrewa-stripe Jan 22, 2023
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 proxy/destinations/destinations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestAddSingleWithFailure(t *testing.T) {
assert.Eventually(t, func() bool {
fixture.destinations.Wait()
return true
}, 2*time.Millisecond, time.Millisecond)
}, 500*time.Millisecond, time.Millisecond)
}

func TestAddMultiple(t *testing.T) {
Expand Down
22 changes: 15 additions & 7 deletions server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ func TestTCPConfig(t *testing.T) {
}
}

func sendTCPMetrics(a *net.TCPAddr, tlsConfig *tls.Config, f *fixture) error {
func sendTCPMetrics(t *testing.T, a *net.TCPAddr, tlsConfig *tls.Config, f *fixture) error {
// TODO: attempt to ensure the accept goroutine opens the port before we attempt to connect
// connect and send stats in two parts
var conn net.Conn
Expand Down Expand Up @@ -549,9 +549,17 @@ func sendTCPMetrics(a *net.TCPAddr, tlsConfig *tls.Config, f *fixture) error {
}

// check that the server received the stats; HACK: sleep to ensure workers process before flush
time.Sleep(20 * time.Millisecond)
foundProcessed := assert.Eventually(
&testing.T{},
func() bool {
return f.server.Workers[0].MetricsProcessedCount() >= 1
},
500*time.Millisecond,
2*time.Millisecond,
"metrics should be processed",
)

if f.server.Workers[0].MetricsProcessedCount() < 1 {
if !foundProcessed {
return fmt.Errorf("metrics were not processed")
}

Expand Down Expand Up @@ -837,7 +845,7 @@ func TestUNIXMetricsSSF(t *testing.T) {

t.Log("Writing the first metric")
_, err := protocol.WriteSSF(conn, testSpan)
firstCtx, firstCancel := context.WithTimeout(ctx, 20*time.Millisecond)
firstCtx, firstCancel := context.WithTimeout(ctx, 500*time.Millisecond)
defer firstCancel()
keepFlushing(firstCtx, f.server)
if assert.NoError(t, err) {
Expand All @@ -848,7 +856,7 @@ func TestUNIXMetricsSSF(t *testing.T) {
firstCancel() // stop flushing like mad

t.Log("Writing the second metric")
secondCtx, secondCancel := context.WithTimeout(ctx, 20*time.Millisecond)
secondCtx, secondCancel := context.WithTimeout(ctx, 500*time.Millisecond)
defer secondCancel()
_, err = protocol.WriteSSF(conn, testSpan)
keepFlushing(secondCtx, f.server)
Expand Down Expand Up @@ -964,7 +972,7 @@ func TestTCPMetrics(t *testing.T) {
// attempt to connect and send stats with each of the client configurations
for i, clientConfig := range clientConfigs {
expectedSuccess := serverConfig.expectedConnectResults[i]
err := sendTCPMetrics(addr, clientConfig.tlsConfig, f)
err := sendTCPMetrics(t, addr, clientConfig.tlsConfig, f)
if err != nil {
if expectedSuccess {
t.Errorf("server config: '%s' client config: '%s' failed: %s",
Expand All @@ -987,7 +995,7 @@ func TestTCPMetrics(t *testing.T) {

// TestHandleTCPGoroutineTimeout verifies that an idle TCP connection doesn't block forever.
func TestHandleTCPGoroutineTimeout(t *testing.T) {
const readTimeout = 30 * time.Millisecond
const readTimeout = 500 * time.Millisecond
s := &Server{
logger: logrus.NewEntry(logrus.New()),
tcpReadTimeout: readTimeout,
Expand Down