Update mimir-prometheus to d162bb51b6ef
#4759
Conversation
zenador
force-pushed
the
zenador/prom-vendor-histo-opt
branch
from
7682390
to
1010392
Compare
zenador
changed the title
894f657c21131bf6ad8b
zenador
force-pushed
the
zenador/prom-vendor-histo-opt
branch
from
1010392
to
dff7206
Compare
zenador
changed the title
21131bf6ad8bd162bb51b6ef
| {fn: "histogram_fraction", tpl: `(<fn>(0,0.5,bar1{}))`}, | ||
| {fn: "histogram_quantile", tpl: `(<fn>(0.5,bar1{}))`}, | ||
| }) | ||
| /* |
There was a problem hiding this comment.
Might be good to add a note about why this is commented out
There was a problem hiding this comment.
I actually don't think this should be commented out.
There was a problem hiding this comment.
I think @beorn7 made functions more strict in what they return when the input is a histogram. So actually the documentation at https://prometheus.io/docs/prometheus/latest/querying/functions/ might need an update, because now it says: "Functions that do not explicitly mention native histograms in their documentation (see below) effectively treat a native histogram as a float sample of value 0. (This is confusing and will change before native histograms become a stable feature.)" But according to the tests it returns empty set now? Need to verify and probably separate float tests vs histograms.
There was a problem hiding this comment.
Separated tests for floats and histograms.
| // FromPointsToSamples converts []promql.Point to []Sample. | ||
| func FromPointsToSamples(points []promql.Point) []Sample { | ||
| // FromFPointsToSamples converts []promql.FPoint to []Sample. | ||
| func FromFPointsToSamples(points []promql.FPoint) []Sample { |
There was a problem hiding this comment.
note: As a next step (different PR) we could return to casting between promql.FPoint and our Sample type. But I'd also rename mimirpb.Sample to mimirpb.FPoint and also it's members so we can have a unit test that checks the compatibility.
| // FromPointsToHistograms converts []promql.Point to []FloatHistogramPair. | ||
| func FromPointsToHistograms(points []promql.Point) []FloatHistogramPair { | ||
| // FromHPointsToHistograms converts []promql.HPoint to []FloatHistogramPair. | ||
| func FromHPointsToHistograms(points []promql.HPoint) []FloatHistogramPair { |
There was a problem hiding this comment.
Same as above, we have a chance to make this zero copy by aligning the types fully.
What this PR does
Updates mimir-prometheus.
See: grafana/mimir-prometheus#480 and grafana/mimir-prometheus#485
Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]