upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-03 20:40:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Skip metric increment during existence check (#12763)

Browse source 
* Skip metric increment during existence check

Signed-off-by: Vinayak Kadam <kadamvinayak03@gmail.com>

* Adding changelog.txt

Signed-off-by: Vinayak Kadam <kadamvinayak03@gmail.com>

* Updated changelog text

Signed-off-by: Vinayak Kadam <kadamvinayak03@gmail.com>
This commit is contained in:
Vinayak 2022-05-05 22:52:19 +05:30 committed by GitHub
parent c00201e57d
commit c22aa710a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog/12763.txt Normal file
View file

@ -0,0 +1,3 @@
```release-note: bug
core: Fix double counting for "route" metrics
```

10
vault/router.go
View file

@ -535,10 +535,12 @@ func (r *Router) routeCommon(ctx context.Context, req *logical.Request, existenc
return logical.ErrorResponse(fmt.Sprintf("no handler for route %q. route entry not found.", req.Path)), false, false, logical.ErrUnsupportedPath
}
req.Path = adjustedPath
defer metrics.MeasureSince([]string{
"route", string(req.Operation),
strings.Replace(mount, "/", "-", -1),
}, time.Now())
if !existenceCheck {
defer metrics.MeasureSince([]string{
"route", string(req.Operation),
strings.Replace(mount, "/", "-", -1),
}, time.Now())
}
re := raw.(*routeEntry)
// Grab a read lock on the route entry, this protects against the backend