feat(query-tee): improvements to skip samples outside comparison window #15794
+380
−48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ashwanthgoli
changed the title
ashwanthgoli
changed the title
slim-bean
reviewed
Jan 21, 2025
Comment on lines
107
to
170
| func TestCompareMatrix_SamplesOutsideComparableWindow(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| name string | ||
| expected json.RawMessage | ||
| actual json.RawMessage | ||
| skipSamplesBefore time.Time | ||
| skipRecentSamples time.Duration | ||
| evaluationTime time.Time | ||
| err error | ||
| }{ | ||
| { | ||
| name: "skip samples before window", | ||
| expected: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[0,"1"],[5,"2"],[15,"3"],[20,"4"]]} | ||
| ]`), | ||
| actual: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[5,"1"],[15,"3"],[20,"4"]]} | ||
| ]`), | ||
| skipSamplesBefore: time.Unix(10, 0), | ||
| evaluationTime: time.Unix(100, 0), | ||
| }, | ||
| { | ||
| name: "skip recent samples", | ||
| expected: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[5,"1"],[25,"2"],[80,"3"],[94,"4"],[96,"5"]]} | ||
| ]`), | ||
| actual: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[5,"1"],[25,"2"],[80,"3"],[95, "4"]]} | ||
| ]`), | ||
| skipRecentSamples: 10 * time.Second, | ||
| evaluationTime: time.Unix(100, 0), | ||
| }, | ||
| { | ||
| name: "skip both recent and old samples", | ||
| expected: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[5,"1"],[25,"2"],[80,"3"],[94,"4"],[96,"5"]]} | ||
| ]`), | ||
| actual: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[5,"0"],[25,"2"],[80,"3"],[95, "4"]]} | ||
| ]`), | ||
| skipSamplesBefore: time.Unix(10, 0), | ||
| skipRecentSamples: 10 * time.Second, | ||
| evaluationTime: time.Unix(100, 0), | ||
| }, | ||
| { | ||
| name: "skip entire series", | ||
| expected: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[50,"1"],[75,"2"]]}, | ||
| {"metric":{"foo":"buzz"},"values":[[5,"1"],[9,"4"],[96,"5"]]} | ||
| ]`), // skip comparing {"foo":"buzz"} | ||
| actual: json.RawMessage(`[ | ||
| {"metric":{"foo":"bar"},"values":[[50,"1"],[75,"2"],[95,"3"]]} | ||
| ]`), | ||
| skipSamplesBefore: time.Unix(10, 0), | ||
| skipRecentSamples: 10 * time.Second, | ||
| evaluationTime: time.Unix(100, 0), | ||
| }, | ||
| } { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| _, err := compareMatrix(tc.expected, tc.actual, tc.evaluationTime, SampleComparisonOptions{ | ||
| SkipSamplesBefore: tc.skipSamplesBefore, | ||
| SkipRecentSamples: tc.skipRecentSamples, | ||
| }) | ||
|
|
There was a problem hiding this comment.
most places we tend to find mistakes/bugs etc are off by one errors and boundaries.
Could you add tests for the exact handoff time (skipSamplesBefore: time.Unix(10,0) and then have a sample at exactly 10 to make sure it does what you expect it to do, same with the skipRecentSamples.
ashwanthgoli
force-pushed
the
querytee-skiprecent-improvements
branch
from
4e5a2d2 to
efebcce
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
proxy.compare-skip-samples-beforecortex_querytee_responses_compared_totalnow reportsskippedcount which was previously getting counted assuccessWhich issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR