Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: avoid race in TestPGPubsub_Metrics by using Eventually#11973

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.

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

Already on GitHub?Sign in to your account

Merged
spikecurtis merged 1 commit intomainfromspike/fix-pg-metric-test-race
Feb 1, 2024
Merged
Changes fromall commits
Commits
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
64 changes: 33 additions & 31 deletionscoderd/database/pubsub/pubsub_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func TestPGPubsub_Metrics(t *testing.T) {

metrics, err := registry.Gather()
require.NoError(t, err)
requireGaugeValue(t, metrics, 0, "coder_pubsub_current_events")
requireGaugeValue(t, metrics, 0, "coder_pubsub_current_subscribers")
require.True(t,gaugeHasValue(t,metrics, 0, "coder_pubsub_current_events"))
require.True(t,gaugeHasValue(t,metrics, 0, "coder_pubsub_current_subscribers"))

event := "test"
data := "testing"
Expand All@@ -60,16 +60,18 @@ func TestPGPubsub_Metrics(t *testing.T) {
}()
_ = testutil.RequireRecvCtx(ctx, t, messageChannel)

metrics, err = registry.Gather()
require.NoError(t, err)
requireGaugeValue(t, metrics, 1, "coder_pubsub_current_events")
requireGaugeValue(t, metrics, 1, "coder_pubsub_current_subscribers")
requireGaugeValue(t, metrics, 1, "coder_pubsub_connected")
requireCounterValue(t, metrics, 1, "coder_pubsub_publishes_total", "true")
requireCounterValue(t, metrics, 1, "coder_pubsub_subscribes_total", "true")
requireCounterValue(t, metrics, 1, "coder_pubsub_messages_total", "normal")
requireCounterValue(t, metrics, 7, "coder_pubsub_received_bytes_total")
requireCounterValue(t, metrics, 7, "coder_pubsub_published_bytes_total")
require.Eventually(t, func() bool {
metrics, err = registry.Gather()
assert.NoError(t, err)
return gaugeHasValue(t, metrics, 1, "coder_pubsub_current_events") &&
gaugeHasValue(t, metrics, 1, "coder_pubsub_current_subscribers") &&
gaugeHasValue(t, metrics, 1, "coder_pubsub_connected") &&
counterHasValue(t, metrics, 1, "coder_pubsub_publishes_total", "true") &&
counterHasValue(t, metrics, 1, "coder_pubsub_subscribes_total", "true") &&
counterHasValue(t, metrics, 1, "coder_pubsub_messages_total", "normal") &&
counterHasValue(t, metrics, 7, "coder_pubsub_received_bytes_total") &&
counterHasValue(t, metrics, 7, "coder_pubsub_published_bytes_total")
}, testutil.WaitShort, testutil.IntervalFast)

colossalData := make([]byte, 7600)
for i := range colossalData {
Expand All@@ -88,20 +90,22 @@ func TestPGPubsub_Metrics(t *testing.T) {
_ = testutil.RequireRecvCtx(ctx, t, messageChannel)
_ = testutil.RequireRecvCtx(ctx, t, messageChannel)

metrics, err = registry.Gather()
require.NoError(t, err)
requireGaugeValue(t, metrics, 1, "coder_pubsub_current_events")
requireGaugeValue(t, metrics, 2, "coder_pubsub_current_subscribers")
requireGaugeValue(t, metrics, 1, "coder_pubsub_connected")
requireCounterValue(t, metrics, 2, "coder_pubsub_publishes_total", "true")
requireCounterValue(t, metrics, 2, "coder_pubsub_subscribes_total", "true")
requireCounterValue(t, metrics, 1, "coder_pubsub_messages_total", "normal")
requireCounterValue(t, metrics, 1, "coder_pubsub_messages_total", "colossal")
requireCounterValue(t, metrics, 7607, "coder_pubsub_received_bytes_total")
requireCounterValue(t, metrics, 7607, "coder_pubsub_published_bytes_total")
require.Eventually(t, func() bool {
metrics, err = registry.Gather()
assert.NoError(t, err)
return gaugeHasValue(t, metrics, 1, "coder_pubsub_current_events") &&
gaugeHasValue(t, metrics, 2, "coder_pubsub_current_subscribers") &&
gaugeHasValue(t, metrics, 1, "coder_pubsub_connected") &&
counterHasValue(t, metrics, 2, "coder_pubsub_publishes_total", "true") &&
counterHasValue(t, metrics, 2, "coder_pubsub_subscribes_total", "true") &&
counterHasValue(t, metrics, 1, "coder_pubsub_messages_total", "normal") &&
counterHasValue(t, metrics, 1, "coder_pubsub_messages_total", "colossal") &&
counterHasValue(t, metrics, 7607, "coder_pubsub_received_bytes_total") &&
counterHasValue(t, metrics, 7607, "coder_pubsub_published_bytes_total")
}, testutil.WaitShort, testutil.IntervalFast)
}

funcrequireGaugeValue(t testing.TB, metrics []*dto.MetricFamily, value float64, name string, label ...string) {
funcgaugeHasValue(t testing.TB, metrics []*dto.MetricFamily, value float64, name string, label ...string) bool {
t.Helper()
for _, family := range metrics {
if family.GetName() != name {
Expand All@@ -115,14 +119,13 @@ func requireGaugeValue(t testing.TB, metrics []*dto.MetricFamily, value float64,
continue
}
}
require.Equal(t, value, m.GetGauge().GetValue())
return
return value == m.GetGauge().GetValue()
}
}
t.Fatal("didn't find metric")
return false
}

funcrequireCounterValue(t testing.TB, metrics []*dto.MetricFamily, value float64, name string, label ...string) {
funccounterHasValue(t testing.TB, metrics []*dto.MetricFamily, value float64, name string, label ...string) bool {
t.Helper()
for _, family := range metrics {
if family.GetName() != name {
Expand All@@ -136,9 +139,8 @@ func requireCounterValue(t testing.TB, metrics []*dto.MetricFamily, value float6
continue
}
}
require.Equal(t, value, m.GetCounter().GetValue())
return
return value == m.GetCounter().GetValue()
}
}
t.Fatal("didn't find metric")
return false
}
[8]ページ先頭
©2009-2025 Movatter.jp