Skip to content

Commit ae41fd6

Browse files
committed
sql: ignore optional span in TestTrace for tenants
Release note: None
1 parent a053744 commit ae41fd6

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pkg/sql/trace_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ func TestTrace(t *testing.T) {
6161
"/cockroach.sql.distsqlrun.DistSQL/FlowStream",
6262
"noop",
6363
}
64+
// These are optional if we use a test tenant.
65+
tenantOptionalSpans := []string{
66+
"/cockroach.roachpb.Internal/RangeLookup",
67+
}
6468
nonVectorizedExpSpans := []string{
6569
"session recording",
6670
"sql txn",
@@ -211,6 +215,9 @@ func TestTrace(t *testing.T) {
211215
if test.distSQL == "on" {
212216
optionalSpans = append(optionalSpans, distsqlOptionalSpans...)
213217
}
218+
if cluster.StartedDefaultTestTenant() {
219+
optionalSpans = append(optionalSpans, tenantOptionalSpans...)
220+
}
214221
expSpans := nonVectorizedExpSpans
215222
if test.vectorize == "on" {
216223
expSpans = vectorizedExpSpans

0 commit comments

Comments
 (0)