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

Jump to bottom

Fix race condition in querytee test #8013

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Fix race condition in querytee test #8013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67f8d5c
Fix race condition in querytee test
jhesketh Apr 30, 2024
829d4e9
Update changelog
jhesketh Apr 30, 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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
### Query-tee

* [ENHANCEMENT] Log queries that take longer than `proxy.log-slow-query-response-threshold` when compared to other backends. #7346
* [ENHANCEMENT] Add two new metrics for measuring the relative duration between backends: #7782
* [ENHANCEMENT] Add two new metrics for measuring the relative duration between backends: #7782 #8013
* `cortex_querytee_backend_response_relative_duration_seconds`
* `cortex_querytee_backend_response_relative_duration_proportional`

Expand Down
17 changes: 7 additions & 10 deletions tools/querytee/proxy_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,6 @@ func Test_ProxyEndpoint_LogSlowQueries(t *testing.T) {
func Test_ProxyEndpoint_RelativeDurationMetric(t *testing.T) {
scenarios := map[string]struct {
latencyPairs []latencyPair
expectedSampleCount uint64
expectedDurationSampleSum float64
expectedProportionalSampleSum float64
}{
Expand All @@ -463,7 +462,6 @@ func Test_ProxyEndpoint_RelativeDurationMetric(t *testing.T) {
secondaryResponseLatency: 2 * time.Second,
},
},
expectedSampleCount: 2,
expectedDurationSampleSum: 5,
expectedProportionalSampleSum: (3.0/1 + 5.0/2),
},
Expand All @@ -473,7 +471,6 @@ func Test_ProxyEndpoint_RelativeDurationMetric(t *testing.T) {
secondaryResponseLatency: 7 * time.Second,
},
},
expectedSampleCount: 1,
expectedDurationSampleSum: -5,
expectedProportionalSampleSum: (2.0 / 7),
},
Expand All @@ -498,27 +495,27 @@ func Test_ProxyEndpoint_RelativeDurationMetric(t *testing.T) {
resp := httptest.NewRecorder()
req, err := http.NewRequest("GET", "http://test/api/v1/test", nil)
require.NoError(t, err)
for range scenario.latencyPairs {
for i := range scenario.latencyPairs {
// This is just in serial to keep the tests simple
endpoint.ServeHTTP(resp, req)
// The HTTP request above will return as soon as the primary response is received, but this doesn't guarantee that the response comparison has been completed.
// Wait for the response comparison to complete the number of requests we have.
// We do this for each latencyPair to avoid a race where the second request would consume a result expected for the first request.
waitForResponseComparisonMetric(t, reg, ComparisonSuccess, uint64(i+1))
}

// The HTTP request above will return as soon as the primary response is received, but this doesn't guarantee that the response comparison has been completed.
// Wait for the response comparison to complete the number of requests we have
waitForResponseComparisonMetric(t, reg, ComparisonSuccess, scenario.expectedSampleCount)

got, done, err := prometheus.ToTransactionalGatherer(reg).Gather()
defer done()
require.NoError(t, err, "Failed to gather metrics from registry")

gotDuration := filterMetrics(got, []string{"cortex_querytee_backend_response_relative_duration_seconds"})
require.Equal(t, 1, len(gotDuration), "Expect only one metric after filtering")
require.Equal(t, scenario.expectedSampleCount, gotDuration[0].Metric[0].Histogram.GetSampleCount())
require.Equal(t, uint64(len(scenario.latencyPairs)), gotDuration[0].Metric[0].Histogram.GetSampleCount())
require.Equal(t, scenario.expectedDurationSampleSum, gotDuration[0].Metric[0].Histogram.GetSampleSum())

gotProportional := filterMetrics(got, []string{"cortex_querytee_backend_response_relative_duration_proportional"})
require.Equal(t, 1, len(gotProportional), "Expect only one metric after filtering")
require.Equal(t, scenario.expectedSampleCount, gotProportional[0].Metric[0].Histogram.GetSampleCount())
require.Equal(t, uint64(len(scenario.latencyPairs)), gotProportional[0].Metric[0].Histogram.GetSampleCount())
require.Equal(t, scenario.expectedProportionalSampleSum, gotProportional[0].Metric[0].Histogram.GetSampleSum())
})
}
Expand Down
Loading