diff --git a/pkg/kv/kvclient/kvtenant/tenant_trace_test.go b/pkg/kv/kvclient/kvtenant/tenant_trace_test.go index f4cc1a0cf897..72c5d9d36a83 100644 --- a/pkg/kv/kvclient/kvtenant/tenant_trace_test.go +++ b/pkg/kv/kvclient/kvtenant/tenant_trace_test.go @@ -79,13 +79,12 @@ func testTenantTracesAreRedactedImpl(t *testing.T, redactable bool) { } s, db, _ := serverutils.StartServer(t, args) - if redactable { - runner := sqlutils.MakeSQLRunner(db) - runner.Exec(t, "SET CLUSTER SETTING trace.redactable.enabled = true") - } defer db.Close() defer s.Stopper().Stop(ctx) + runner := sqlutils.MakeSQLRunner(db) + runner.Exec(t, "SET CLUSTER SETTING trace.redactable.enabled = $1", redactable) + // Queries from the system tenant will receive unredacted traces // since the tracer will not have the redactable flag set. t.Run("system-tenant", func(t *testing.T) { diff --git a/pkg/util/tracing/tracer.go b/pkg/util/tracing/tracer.go index d6b1c00eb036..b48742805456 100644 --- a/pkg/util/tracing/tracer.go +++ b/pkg/util/tracing/tracer.go @@ -108,11 +108,8 @@ const ( var enableTraceRedactable = settings.RegisterBoolSetting( settings.TenantWritable, "trace.redactable.enabled", - "set to true to enable redactability for unstructured events "+ - "in traces and to redact traces sent to tenants. "+ - "Set to false to coarsely mark unstructured events as redactable "+ - " and eliminate them from tenant traces.", - false, + "set to true to enable finer-grainer redactability for unstructured events in traces", + true, ) var enableNetTrace = settings.RegisterBoolSetting(