Skip to content

Conversation

@yuzefovich
Copy link
Member

Fixes: #157033.
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich yuzefovich changed the title sql: ignore optional span in TestTrace for tenants sql: ignore optional spans in TestTrace for tenants Nov 7, 2025
@yuzefovich yuzefovich marked this pull request as ready for review November 7, 2025 02:09
@yuzefovich yuzefovich requested review from a team and mw5h and removed request for a team November 7, 2025 02:09
@yuzefovich
Copy link
Member Author

TFTR!

bors r+

craig bot pushed a commit that referenced this pull request Nov 10, 2025
157036: sql: ignore optional spans in TestTrace for tenants r=yuzefovich a=yuzefovich

Fixes: #157033.
Release note: None

Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented Nov 10, 2025

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

craig bot pushed a commit that referenced this pull request Nov 10, 2025
157036: sql: ignore optional spans in TestTrace for tenants r=yuzefovich a=yuzefovich

Fixes: #157033.
Release note: None

Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented Nov 10, 2025

Build failed:

@yuzefovich
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 10, 2025

@craig craig bot merged commit e5d4877 into cockroachdb:master Nov 10, 2025
24 of 25 checks passed
@yuzefovich yuzefovich deleted the fix-trace-flake branch November 10, 2025 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

sql: TestTrace failed

3 participants