ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-12 19:32:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

server: Correct server input parsing metric

Browse Source 
The metric was using `metrics.RegoQueryParse` but it isn't actually
doing the query parse there. It is parsing the input document.

Signed-off-by: Patrick East <east.patrick@gmail.com>
This commit is contained in:
Patrick East
2019-12-16 16:55:11 -08:00
parent feaf745da9
commit 051c3b8273
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server.go
+5 -5
View File
@@ -1033,7 +1033,7 @@ func (s *Server) v1DataGet(w http.ResponseWriter, r *http.Request) {
includeInstrumentation := getBoolParam(r.URL, types.ParamInstrumentV1, true)
provenance := getBoolParam(r.URL, types.ParamProvenanceV1, true)
m.Timer(metrics.RegoQueryParse).Start()
m.Timer(metrics.RegoInputParse).Start()
inputs := r.URL.Query()[types.ParamInputV1]
@@ -1048,8 +1048,6 @@ func (s *Server) v1DataGet(w http.ResponseWriter, r *http.Request) {
}
}
m.Timer(metrics.RegoQueryParse).Stop()
var goInput *interface{}
if input != nil {
x, err := ast.JSON(input)
@@ -1060,6 +1058,8 @@ func (s *Server) v1DataGet(w http.ResponseWriter, r *http.Request) {
goInput = &x
}
m.Timer(metrics.RegoInputParse).Stop()
// Prepare for query.
txn, err := s.store.NewTransaction(ctx)
if err != nil {
@@ -1231,7 +1231,7 @@ func (s *Server) v1DataPost(w http.ResponseWriter, r *http.Request) {
partial := getBoolParam(r.URL, types.ParamPartialV1, true)
provenance := getBoolParam(r.URL, types.ParamProvenanceV1, true)
m.Timer(metrics.RegoQueryParse).Start()
m.Timer(metrics.RegoInputParse).Start()
input, err := readInputPostV1(r)
if err != nil {
@@ -1249,7 +1249,7 @@ func (s *Server) v1DataPost(w http.ResponseWriter, r *http.Request) {
goInput = &x
}
m.Timer(metrics.RegoQueryParse).Stop()
m.Timer(metrics.RegoInputParse).Stop()
txn, err := s.store.NewTransaction(ctx)
if err != nil {