mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #547 from grafana/zenador/remove-NewPossibleNonCounterInfo

Browse source 
Remove NewPossibleNonCounterInfo until it can be made more efficient
This commit is contained in:
zenador 2023-10-23 14:53:43 +08:00 committed by GitHub
parent d0d6240125 48e64fdd4d
commit debd4b196e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
promql/engine.go
View file

@ -2536,7 +2536,7 @@ type groupedAggregation struct {
func (ev *evaluator) aggregation(e *parser.AggregateExpr, grouping []string, param interface{}, vec Vector, seriesHelper []EvalSeriesHelper, enh *EvalNodeHelper) (Vector, annotations.Annotations) { func (ev *evaluator) aggregation(e *parser.AggregateExpr, grouping []string, param interface{}, vec Vector, seriesHelper []EvalSeriesHelper, enh *EvalNodeHelper) (Vector, annotations.Annotations) {
op := e.Op op := e.Op
without := e.Without without := e.Without
annos := annotations.Annotations{} var annos annotations.Annotations
result := map[uint64]*groupedAggregation{} result := map[uint64]*groupedAggregation{}
orderedResult := []*groupedAggregation{} orderedResult := []*groupedAggregation{}
var k int64 var k int64

14
promql/functions.go
View file

@ -77,7 +77,7 @@ func extrapolatedRate(vals []parser.Value, args parser.Expressions, enh *EvalNod
resultHistogram *histogram.FloatHistogram resultHistogram *histogram.FloatHistogram
firstT, lastT int64 firstT, lastT int64
numSamplesMinusOne int numSamplesMinusOne int
annos = annotations.Annotations{} annos annotations.Annotations
) )
// We need either at least two Histograms and no Floats, or at least two // We need either at least two Histograms and no Floats, or at least two
@ -88,14 +88,6 @@ func extrapolatedRate(vals []parser.Value, args parser.Expressions, enh *EvalNod
return enh.Out, annos.Add(annotations.NewMixedFloatsHistogramsWarning(metricName, args[0].PositionRange())) return enh.Out, annos.Add(annotations.NewMixedFloatsHistogramsWarning(metricName, args[0].PositionRange()))
} }
if isCounter && metricName != "" && len(samples.Floats) > 0 &&
!strings.HasSuffix(metricName, "_total") &&
!strings.HasSuffix(metricName, "_sum") &&
!strings.HasSuffix(metricName, "_count") &&
!strings.HasSuffix(metricName, "_bucket") {
annos.Add(annotations.NewPossibleNonCounterInfo(metricName, args[0].PositionRange()))
}
switch { switch {
case len(samples.Histograms) > 1: case len(samples.Histograms) > 1:
numSamplesMinusOne = len(samples.Histograms) - 1 numSamplesMinusOne = len(samples.Histograms) - 1
@ -642,7 +634,7 @@ func funcQuantileOverTime(vals []parser.Value, args parser.Expressions, enh *Eva
return enh.Out, nil return enh.Out, nil
} }
annos := annotations.Annotations{} var annos annotations.Annotations
if math.IsNaN(q) || q < 0 || q > 1 { if math.IsNaN(q) || q < 0 || q > 1 {
annos.Add(annotations.NewInvalidQuantileWarning(q, args[0].PositionRange())) annos.Add(annotations.NewInvalidQuantileWarning(q, args[0].PositionRange()))
} }
@ -1105,7 +1097,7 @@ func funcHistogramFraction(vals []parser.Value, args parser.Expressions, enh *Ev
func funcHistogramQuantile(vals []parser.Value, args parser.Expressions, enh *EvalNodeHelper) (Vector, annotations.Annotations) { func funcHistogramQuantile(vals []parser.Value, args parser.Expressions, enh *EvalNodeHelper) (Vector, annotations.Annotations) {
q := vals[0].(Vector)[0].F q := vals[0].(Vector)[0].F
inVec := vals[1].(Vector) inVec := vals[1].(Vector)
annos := annotations.Annotations{} var annos annotations.Annotations
if math.IsNaN(q) || q < 0 || q > 1 { if math.IsNaN(q) || q < 0 || q > 1 {
annos.Add(annotations.NewInvalidQuantileWarning(q, args[0].PositionRange())) annos.Add(annotations.NewInvalidQuantileWarning(q, args[0].PositionRange()))