Skip to content

fix: resolve race condition in prometheus.receive_http test #4681

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 1 commit into
base: main
Choose a base branch
from
Draft

fix: resolve race condition in prometheus.receive_http test #4681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions internal/component/prometheus/receive_http/receive_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,15 @@ func (c *Component) shutdownServer() {
c.server = nil
}
}

func (c *Component) getServer() *fnet.TargetServer {
c.updateMut.RLock()
defer c.updateMut.RUnlock()
return c.server
}

func (c *Component) getArgs() Arguments {
c.updateMut.RLock()
defer c.updateMut.RUnlock()
return c.args
}
12 changes: 6 additions & 6 deletions internal/component/prometheus/receive_http/receive_http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,18 +440,19 @@
serverExit <- comp.Run(ctx)
}()

waitForServerToBeReady(t, comp.args)
waitForServerToBeReady(t, comp.getArgs())

initialServer := comp.server
initialServer := comp.getServer()
require.NotNil(t, initialServer)

err = comp.Update(tc.newArgs)
require.NoError(t, err)

waitForServerToBeReady(t, comp.args)
waitForServerToBeReady(t, comp.getArgs())

require.NotNil(t, comp.server)
restarted := initialServer != comp.server
currentServer := comp.getServer()
require.NotNil(t, currentServer)
restarted := initialServer != currentServer

require.Equal(t, tc.shouldRestart, restarted)

Expand Down Expand Up @@ -563,8 +564,7 @@
ts int64,
val float64,
next storage.Appender,
) (storage.SeriesRef, error) {

Check failure on line 567 in internal/component/prometheus/receive_http/receive_http_test.go

View workflow job for this annotation

GitHub Actions / lint / Lint Go 

multi-line statement should be followed by a newline (whitespace)

actualSamples <- testSample{ts: ts, val: val, l: l}
return ref, nil
}
Expand Down
Loading