cover: Disable local var plugging on trace

Similar treatment as what we do with the `Profiler`, the coverage
tracer will now signal via configuration that it doesn't need local
variable metadata.

This improves the speed of evaluations with only coverage enabled by
a pretty substantial amount, in particular with many/larger variables.

Signed-off-by: Patrick East <east.patrick@gmail.com>
This commit is contained in:
Patrick East
2020-05-19 17:48:23 -07:00
parent 837011c5bc
commit dff78c48b9
3 changed files with 100 additions and 0 deletions
+7
View File
@@ -31,6 +31,13 @@ func (c *Cover) Enabled() bool {
return true
}
// Config returns the standard Tracer configuration for the Cover tracer
func (c *Cover) Config() topdown.TraceConfig {
return topdown.TraceConfig{
PlugLocalVars: false, // Event variable metadata is not required for the Coverage report
}
}
// Report returns a coverage Report for the given modules.
func (c *Cover) Report(modules map[string]*ast.Module) (report Report) {
report.Files = map[string]*FileReport{}
+78
View File
@@ -0,0 +1,78 @@
// Copyright 2020 The OPA Authors. All rights reserved.
// Use of this source code is governed by an Apache2
// license that can be found in the LICENSE file.
package cover
import (
"context"
"fmt"
"strings"
"testing"
"github.com/open-policy-agent/opa/ast"
"github.com/open-policy-agent/opa/rego"
)
func BenchmarkCoverBigLocalVar(b *testing.B) {
iterations := []int{1, 100, 1000}
vars := []int{1, 10}
for _, iterationCount := range iterations {
for _, varCount := range vars {
name := fmt.Sprintf("%dVars%dIterations", varCount, iterationCount)
b.Run(name, func(b *testing.B) {
cover := New()
module := generateModule(varCount, iterationCount)
_, err := ast.ParseModule("test.rego", module)
if err != nil {
b.Fatal(err)
}
ctx := context.Background()
pq, err := rego.New(
rego.Module("test.rego", module),
rego.Query("data.test.p"),
).PrepareForEval(ctx)
if err != nil {
b.Fatal(err)
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
b.StartTimer()
_, err = pq.Eval(ctx, rego.EvalTracer(cover))
b.StopTimer()
if err != nil {
b.Fatal(err)
}
}
})
}
}
}
func generateModule(numVars int, dataSize int) string {
sb := strings.Builder{}
sb.WriteString(`package test
p {
x := a
v := x[i]
`)
for i := 0; i < numVars; i++ {
sb.WriteString(fmt.Sprintf("\tv%d := x[i+%d]\n", i, i))
}
sb.WriteString("\tfalse\n}\n")
sb.WriteString("\na := [\n")
for i := 0; i < dataSize; i++ {
sb.WriteString(fmt.Sprintf("\t%d,\n", i))
}
sb.WriteString("]\n")
return sb.String()
}
+15
View File
@@ -8,10 +8,12 @@ import (
"context"
"encoding/json"
"fmt"
"reflect"
"testing"
"github.com/open-policy-agent/opa/ast"
"github.com/open-policy-agent/opa/rego"
"github.com/open-policy-agent/opa/topdown"
)
func TestCover(t *testing.T) {
@@ -136,3 +138,16 @@ p {
fmt.Println(string(bs))
}
}
func TestCoverTraceConfig(t *testing.T) {
ct := topdown.CustomTracer(New())
conf := ct.Config()
expected := topdown.TraceConfig{
PlugLocalVars: false,
}
if !reflect.DeepEqual(expected, conf) {
t.Fatalf("Expected config: %+v, got %+v", expected, conf)
}
}