This change is 

The changes on conn_test.go seem unrelated.

whoops that was from debugging #93538

tftr!

bors r+

Build failed (retrying...):

• Bazel Essential CI (Cockroach)

Build succeeded:

• Bazel Essential CI (Cockroach)

Encountered an error creating backports. Some common things that can go wrong:

1. The backport branch might have already existed.
2. There was a merge conflict.
3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from 1a34b58 to blathers/backport-release-22.1-93607: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.1.x failed. See errors above.

error creating merge commit from 1a34b58 to blathers/backport-release-22.2-93607: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.

_{🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.}