mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 21:54:10 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #11723 from alanprot/span-fix

Browse source 
Finishing evalSpanTimer always before return
This commit is contained in:
Julien Pivotto 2022-12-14 22:53:10 +01:00 committed by GitHub
parent 88ee72dea3 8460807475
commit c3fac587ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
promql/engine.go
View file

@ -653,12 +653,13 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *parser.Eval
query.sampleStats.InitStepTracking(start, start, 1) query.sampleStats.InitStepTracking(start, start, 1)
val, warnings, err := evaluator.Eval(s.Expr) val, warnings, err := evaluator.Eval(s.Expr)
evalSpanTimer.Finish()
if err != nil { if err != nil {
return nil, warnings, err return nil, warnings, err
} }
evalSpanTimer.Finish()
var mat Matrix var mat Matrix
switch result := val.(type) { switch result := val.(type) {
@ -704,10 +705,12 @@ func (ng *Engine) execEvalStmt(ctx context.Context, query *query, s *parser.Eval
} }
query.sampleStats.InitStepTracking(evaluator.startTimestamp, evaluator.endTimestamp, evaluator.interval) query.sampleStats.InitStepTracking(evaluator.startTimestamp, evaluator.endTimestamp, evaluator.interval)
val, warnings, err := evaluator.Eval(s.Expr) val, warnings, err := evaluator.Eval(s.Expr)
evalSpanTimer.Finish()
if err != nil { if err != nil {
return nil, warnings, err return nil, warnings, err
} }
evalSpanTimer.Finish()
mat, ok := val.(Matrix) mat, ok := val.(Matrix)
if !ok { if !ok {