Merge #158367

craig[bot] · yuzefovich · craig[bot] · commit 53523945ee9d · 2025-12-01T14:29:06.000Z
158367: sql: fix dRPC-related flake in TestTrace r=yuzefovich a=yuzefovich When we use dRPC, there is an additional tracing span `/cockroach.roachpb.KVBatch/Batch` that we don't create with gRPC, so mark it as optional in the test. Informs: #158323. Epic: None Release note: None Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
diff --git a/pkg/sql/trace_test.go b/pkg/sql/trace_test.go
@@ -52,6 +52,7 @@ func TestTrace(t *testing.T) {
 		"local proposal",
 		"admissionWorkQueueWait",
 		"index recommendation",
+		"/cockroach.roachpb.KVBatch/Batch", // present with dRPC, absent with gRPC
 	}
 	// Depending on whether the data is local or not, we may not see these
 	// spans. Only applicable with distsql=on.

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ func TestTrace(t *testing.T) {`
`52`	`52`	`"local proposal",`
`53`	`53`	`"admissionWorkQueueWait",`
`54`	`54`	`"index recommendation",`
	`55`	`+ "/cockroach.roachpb.KVBatch/Batch", // present with dRPC, absent with gRPC`
`55`	`56`	`}`
`56`	`57`	`// Depending on whether the data is local or not, we may not see these`
`57`	`58`	`// spans. Only applicable with distsql=on.`