Add NH count validation #7072
Merged
Add NH count validation #7072
+180
−10
Conversation
This file contains hidden or 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
SungJin1212
force-pushed
the
Add-NH-count-validation
branch
from
3fd4fe7 to
940f1bd
Compare
yeya24
reviewed
Nov 3, 2025
pkg/util/validation/validate.go
Outdated
| } | ||
|
|
||
| // copy from https://github.com/prometheus/prometheus/blob/v3.6.0/model/histogram/generic.go#L399-L420 | ||
| func checkHistogramBuckets[BC histogram.BucketCount, IBC histogram.InternalBucketCount](buckets []IBC, count *BC, deltas bool) (float64, error) { |
There was a problem hiding this comment.
Why we have to maintain this function and validation ourselves instead of reusing the validation function in Prometheus https://github.com/prometheus/prometheus/blob/main/model/histogram/histogram.go#L425C21-L425C29?
There was a problem hiding this comment.
Yeah we could utilize it. If we do that, it seems like we should return a single error type for these different causes.
There was a problem hiding this comment.
I've updated to use Prometheus's Validate function and moved the check for invalid NH before the limit check to ensure we return a 400 error for them.
Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: SungJin1212 <[email protected]>
SungJin1212
force-pushed
the
Add-NH-count-validation
branch
from
940f1bd to
2602c78
Compare
Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: SungJin1212 <[email protected]>
yeya24
approved these changes
Nov 3, 2025
|
|
||
| if histogramSample.IsFloatHistogram() { | ||
| // Initial check to see if the bucket limit is exceeded or not. If not, we can avoid type casting. | ||
| fh := cortexpb.FloatHistogramProtoToFloatHistogram(histogramSample) |
There was a problem hiding this comment.
For next PR, consider adding sync pool here to reduce allocation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR adds count validation for NH in Distributor side.
Which issue(s) this PR fixes:
Fixes #7042
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]