diff --git a/authorize/evaluator/evaluator.go b/authorize/evaluator/evaluator.go
index 8cc978c1c..9ea1b81d2 100644
--- a/authorize/evaluator/evaluator.go
+++ b/authorize/evaluator/evaluator.go
@@ -13,6 +13,7 @@ import (
 	"github.com/pomerium/pomerium/config"
 	"github.com/pomerium/pomerium/internal/httputil"
 	"github.com/pomerium/pomerium/internal/log"
+	"github.com/pomerium/pomerium/internal/telemetry/trace"
 	"github.com/pomerium/pomerium/internal/urlutil"
 	"github.com/pomerium/pomerium/pkg/cryptutil"
 )
@@ -100,6 +101,9 @@ func New(ctx context.Context, store *Store, options ...Option) (*Evaluator, erro
 
 // Evaluate evaluates the rego for the given policy and generates the identity headers.
 func (e *Evaluator) Evaluate(ctx context.Context, req *Request) (*Result, error) {
+	_, span := trace.StartSpan(ctx, "authorize.Evaluator.Evaluate")
+	defer span.End()
+
 	if req.Policy == nil {
 		return notFoundOutput, nil
 	}
diff --git a/authorize/evaluator/headers_evaluator.go b/authorize/evaluator/headers_evaluator.go
index 7fea6b797..555e0f2ea 100644
--- a/authorize/evaluator/headers_evaluator.go
+++ b/authorize/evaluator/headers_evaluator.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/pomerium/pomerium/authorize/evaluator/opa"
 	"github.com/pomerium/pomerium/config"
+	"github.com/pomerium/pomerium/internal/telemetry/trace"
 	"github.com/pomerium/pomerium/internal/urlutil"
 )
 
@@ -67,6 +68,8 @@ func NewHeadersEvaluator(ctx context.Context, store *Store) (*HeadersEvaluator,
 
 // Evaluate evaluates the headers.rego script.
 func (e *HeadersEvaluator) Evaluate(ctx context.Context, req *HeadersRequest) (*HeadersResponse, error) {
+	_, span := trace.StartSpan(ctx, "authorize.HeadersEvaluator.Evaluate")
+	defer span.End()
 	rs, err := safeEval(ctx, e.q, rego.EvalInput(req))
 	if err != nil {
 		return nil, fmt.Errorf("authorize: error evaluating headers.rego: %w", err)
diff --git a/authorize/evaluator/policy_evaluator.go b/authorize/evaluator/policy_evaluator.go
index d344d565a..3541d4357 100644
--- a/authorize/evaluator/policy_evaluator.go
+++ b/authorize/evaluator/policy_evaluator.go
@@ -2,15 +2,19 @@ package evaluator
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
 
 	"github.com/open-policy-agent/opa/rego"
+	octrace "go.opencensus.io/trace"
 
 	"github.com/pomerium/pomerium/config"
 	"github.com/pomerium/pomerium/internal/log"
+	"github.com/pomerium/pomerium/internal/telemetry/trace"
 	"github.com/pomerium/pomerium/pkg/policy"
 )
 
@@ -46,9 +50,14 @@ type Denial struct {
 	Message string
 }
 
+type policyQuery struct {
+	rego.PreparedEvalQuery
+	checksum string
+}
+
 // A PolicyEvaluator evaluates policies.
 type PolicyEvaluator struct {
-	queries []rego.PreparedEvalQuery
+	queries []policyQuery
 }
 
 // NewPolicyEvaluator creates a new PolicyEvaluator.
@@ -106,7 +115,15 @@ func NewPolicyEvaluator(ctx context.Context, store *Store, configPolicy *config.
 		if err != nil {
 			return nil, err
 		}
-		e.queries = append(e.queries, q)
+
+		h := sha256.New()
+		h.Write([]byte(script))
+		checksum := hex.EncodeToString(h.Sum(nil))
+
+		e.queries = append(e.queries, policyQuery{
+			PreparedEvalQuery: q,
+			checksum:          checksum,
+		})
 	}
 
 	return e, nil
@@ -126,8 +143,12 @@ func (e *PolicyEvaluator) Evaluate(ctx context.Context, req *PolicyRequest) (*Po
 	return res, nil
 }
 
-func (e *PolicyEvaluator) evaluateQuery(ctx context.Context, req *PolicyRequest, query rego.PreparedEvalQuery) (*PolicyResponse, error) {
-	rs, err := safeEval(ctx, query, rego.EvalInput(req))
+func (e *PolicyEvaluator) evaluateQuery(ctx context.Context, req *PolicyRequest, query policyQuery) (*PolicyResponse, error) {
+	_, span := trace.StartSpan(ctx, "authorize.PolicyEvaluator.evaluateQuery")
+	defer span.End()
+	span.AddAttributes(octrace.StringAttribute("script_checksum", query.checksum))
+
+	rs, err := safeEval(ctx, query.PreparedEvalQuery, rego.EvalInput(req))
 	if err != nil {
 		return nil, fmt.Errorf("authorize: error evaluating policy.rego: %w", err)
 	}