Remove obsolete check preventing NHCB and CT zero ingestion#17305
Remove obsolete check preventing NHCB and CT zero ingestion#17305krajorama merged 9 commits intoprometheus:mainfrom
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR removes an obsolete check that prevented the simultaneous use of Native Histograms with Custom Buckets (NHCB) and created timestamp zero ingestion. The check was a temporary workaround for issue #15137 which has apparently been resolved.
- Removed the conditional check that logged an error and skipped configuration when both NHCB and created timestamp zero ingestion were enabled
- Eliminated the TODO comment referencing the GitHub issue
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
49ba045 to
ba0f464
Compare
Signed-off-by: Harsh <harshmastic@gmail.com>
ba0f464 to
c6793e7
Compare
…sage Signed-off-by: Harsh <harshmastic@gmail.com>
5d9d5fd to
febd734
Compare
|
@roidelapluie Please take a look |
krajorama
left a comment
There was a problem hiding this comment.
LGTM, thank you! I've looked at the original issue in #15137 and it also complained about exemplars and OpenMetrics exposition (not protobuf) .
Would you mind modifying this test to have a few exemplars as well?
# HELP something Histogram with _created between buckets and summary
# TYPE something histogram
something_count 18
something_sum 324789.4
something_created 1520430001
something_bucket{le="0.0"} 1
something_bucket{le="+Inf"} 18 8 # {id="something-bucket-a-test"} 4
something_count{a="b"} 9
something_sum{a="b"} 42123.0
something_bucket{a="b",le="0.0"} 8 # {id="something-bucket-b-test"} -4
something_bucket{a="b",le="+Inf"} 9 # {id="something-bucket-b-test"} 6
something_created{a="b"} 1520430002
Diff:
diff --git a/model/textparse/nhcbparse_test.go b/model/textparse/nhcbparse_test.go
index f5836b5f7..61671d306 100644
--- a/model/textparse/nhcbparse_test.go
+++ b/model/textparse/nhcbparse_test.go
@@ -96,11 +96,11 @@ something_count 18
something_sum 324789.4
something_created 1520430001
something_bucket{le="0.0"} 1
-something_bucket{le="+Inf"} 18
+something_bucket{le="+Inf"} 18 8 # {id="something-bucket-a-test"} 4
something_count{a="b"} 9
something_sum{a="b"} 42123.0
-something_bucket{a="b",le="0.0"} 8
-something_bucket{a="b",le="+Inf"} 9
+something_bucket{a="b",le="0.0"} 8 # {id="something-bucket-b-test"} -4
+something_bucket{a="b",le="+Inf"} 9 # {id="something-bucket-b-test"} 6
something_created{a="b"} 1520430002
# HELP yum Summary with _created between sum and quantiles
# TYPE yum summary
@@ -368,6 +368,7 @@ foobar{quantile="0.99"} 150.1`
CustomValues: []float64{0.0}, // We do not store the +Inf boundary.
},
lset: labels.FromStrings("__name__", "something"),
+ es: []exemplar.Exemplar{{Labels: labels.FromStrings("id", "something-bucket-a-test"), Value: 4}},
ct: 1520430001000,
}, {
m: `something{a="b"}`,
@@ -380,6 +381,10 @@ foobar{quantile="0.99"} 150.1`
CustomValues: []float64{0.0}, // We do not store the +Inf boundary.
},
lset: labels.FromStrings("__name__", "something", "a", "b"),
+ es: []exemplar.Exemplar{
+ {Labels: labels.FromStrings("id", "something-bucket-b-test"), Value: -4},
+ {Labels: labels.FromStrings("id", "something-bucket-b-test"), Value: 6},
+ },
ct: 1520430002000,
}, {
m: "yum",
…ng with created timestamps Signed-off-by: Harsh <harshmastic@gmail.com>
04c8d08 to
3a7a8d7
Compare
b875227 to
ae2d5a3
Compare
Signed-off-by: Harsh <harshmastic@gmail.com>
ae2d5a3 to
a63414b
Compare
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
|
Please remove those extra redundant docstrings from the end of the test and I'll merge this. see #17305 (comment) |
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
oops must have missed it |
krajorama
left a comment
There was a problem hiding this comment.
LGTM, thank you. I'll merge when you make CI pass.
Signed-off-by: Harsh <harshmastic@gmail.com>
6f551d7 to
4d7d8eb
Compare
Which issue(s) does the PR fix:
Fixes #17216
Does this PR introduce a user-facing change?