util/tracing: trim trace recordings in a smarter way

pkg/server/admin.go

@@ -3906,7 +3906,8 @@ func (s *adminServer) GetTrace(
 		}
 		traceStillExists = true
 		if recording == nil {
-			recording = sp.GetFullRecording(tracingpb.RecordingVerbose)
+			trace := sp.GetFullRecording(tracingpb.RecordingVerbose)
+			recording = trace.Flatten()
 		}
 		return iterutil.StopIteration()
 	}); err != nil {

pkg/server/node_tenant.go

@@ -28,7 +28,6 @@ import "github.com/cockroachdb/cockroach/pkg/util/tracing/tracingpb"
 func redactRecording(rec tracingpb.Recording) {
 	for i := range rec {
 		sp := &rec[i]
-		sp.Tags = nil // TODO(benbardin): Remove for 23.1.
 		sp.TagGroups = nil
 		for j := range sp.Logs {
 			record := &sp.Logs[j]

pkg/server/node_tenant_test.go

@@ -57,7 +57,6 @@ func TestRedactRecordingForTenant(t *testing.T) {
 
 	rec := mkRec()
 	redactRecording(rec)
-	require.Zero(t, rec[0].Tags)
 	require.Zero(t, rec[0].TagGroups)
 	require.Len(t, rec[0].Logs, 1)
 	msg := rec[0].Logs[0].Msg().StripMarkers()
@@ -79,7 +78,6 @@ func TestNewSpanFields(t *testing.T) {
 		SpanID            tracingpb.SpanID
 		ParentSpanID      tracingpb.SpanID
 		Operation         string
-		Tags              map[string]string
 		TagGroups         []tracingpb.TagGroup
 		StartTime         time.Time
 		Duration          time.Duration

pkg/sql/crdb_internal.go

@@ -1520,7 +1520,8 @@ CREATE TABLE crdb_internal.node_inflight_trace_spans (
 				"only users with the admin role are allowed to read crdb_internal.node_inflight_trace_spans")
 		}
 		return p.ExecCfg().AmbientCtx.Tracer.VisitSpans(func(span tracing.RegistrySpan) error {
-			for _, rec := range span.GetFullRecording(tracingpb.RecordingVerbose) {
+			trace := span.GetFullRecording(tracingpb.RecordingVerbose)
+			for _, rec := range trace.Flatten() {
 				traceID := rec.TraceID
 				parentSpanID := rec.ParentSpanID
 				spanID := rec.SpanID

pkg/sql/sem/builtins/generator_builtins.go

@@ -2253,12 +2253,12 @@ func (p *payloadsForSpanGenerator) Start(_ context.Context, _ *kv.Txn) error {
 	p.payloadIndex = -1
 
 	rec := p.span.GetFullRecording(tracingpb.RecordingStructured)
-	if rec == nil {
+	if rec.Empty() {
 		// No structured records.
 		return nil
 	}
-	p.payloads = make([]json.JSON, len(rec[0].StructuredRecords))
-	for i, sr := range rec[0].StructuredRecords {
+	p.payloads = make([]json.JSON, len(rec.Root.StructuredRecords))
+	for i, sr := range rec.Root.StructuredRecords {
 		var err error
 		p.payloads[i], err = protoreflect.MessageToJSON(sr.Payload, protoreflect.FmtFlags{EmitDefaults: true})
 		if err != nil {

pkg/testutils/testcluster/testcluster.go

@@ -172,7 +172,8 @@ func (tc *TestCluster) stopServers(ctx context.Context) {
 			fmt.Fprintf(&buf, "unexpectedly found %d active spans:\n", len(sps))
 			var ids []uint64
 			for _, sp := range sps {
-				rec := sp.GetFullRecording(tracingpb.RecordingVerbose)
+				trace := sp.GetFullRecording(tracingpb.RecordingVerbose)
+				rec := trace.Flatten()
 				for _, rs := range rec {
 					// NB: it would be a sight easier to just include these in the output of
 					// the string formatted recording, but making a change there presumably requires