Merge #143695 #143749

143695: tree: include gist into enum comparison assertion r=yuzefovich a=yuzefovich

In theory, the plan gist should already be included in all ~assertion failures~sentry reports, but it doesn't happen in practice. Let's include it explicitly (if it is present in the context) into the enum mismatched version comparison error to help with tracking it down.

Informs: #143571
Epic: None
Release note: None

143749: build/README: add step to upgrade golang.org/x packages r=jlinder a=rickystewart

[Internal discussion](https://cockroachlabs.slack.com/archives/CJ0H8Q97C/p1743193919914069)

Epic: none
Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Ricky Stewart <[email protected]>

Author: 3 people

build/README.md

@@ -75,6 +75,10 @@ do so:
 
 # Updating the golang version
 
+The Go upgrade process is documented [here](https://cockroachlabs.atlassian.net/wiki/spaces/devinf/pages/4193714322/CockroachDB+Go+upgrade+policy+and+process).
+This checklist is meant to be followed by the dev-inf team member that
+performs the upgrade and constructs the draft PR.
+
 Please copy this checklist into the relevant commit message and perform these
 steps:
 
@@ -87,7 +91,8 @@ steps:
 * [ ] Adjust `--@io_bazel_rules_go//go/toolchain:sdk_version` in [.bazelrc](../.bazelrc).
 * [ ] Bump the version in `WORKSPACE` under `go_download_sdk`. You may need to bump [rules_go](https://github.com/bazelbuild/rules_go/releases). Also edit the filenames listed in `sdks` and update all the hashes to match what you built in the step above.
 * [ ] Bump the version in `WORKSPACE` under `go_download_sdk` for the FIPS version of Go (`go_sdk_fips`).
-* [ ] Run `./dev generate bazel` to refresh `distdir_files.bzl`, then `bazel fetch @distdir//:archives` to ensure you've updated all hashes to the correct value.
+* [ ] Upgrade golang.org/x packages; these are maintained by the Go project and it's reasonable to upgrade them when doing our Go upgrade. Run `grep -e '^\tgolang.org/x' go.mod | grep -v vcs | grep -v image | grep -v typeparams | cut -w -f2 | sed 's/$/@latest/' | xargs go get`. (Note: we don't upgrade certain libraries that are not linked into CRDB, hence the `grep -v`.)
+* [ ] Run `./dev generate bazel --mirror`, then `bazel fetch @distdir//:archives` to ensure you've updated all hashes to the correct value.
 * [ ] Bump the go version in `go.mod`.
 * [ ] Bump the default installed version of Go in `bootstrap-debian.sh` ([source](./bootstrap/bootstrap-debian.sh)).
 * [ ] Replace other mentions of the older version of go (grep for `golang:<old_version>` and `go<old_version>`).

pkg/sql/conn_executor.go

@@ -4854,4 +4854,5 @@ func init() {
 	logcrash.RegisterTagFn("gist", func(ctx context.Context) string {
 		return planGistFromCtx(ctx)
 	})
+	tree.PlanGistFromCtx = planGistFromCtx
 }

pkg/sql/sem/tree/datum.go

@@ -5474,6 +5474,10 @@ func (d *DEnum) ResolvedType() *types.T {
 	return d.EnumTyp
 }
 
+// PlanCistFromCtx returns the plan gist if it is stored in the context. It is
+// injected from the sql package to avoid import cycle.
+var PlanGistFromCtx func(context.Context) string
+
 // Compare implements the Datum interface.
 func (d *DEnum) Compare(ctx context.Context, cmpCtx CompareContext, other Datum) (int, error) {
 	if other == DNull {
@@ -5491,10 +5495,16 @@ func (d *DEnum) Compare(ctx context.Context, cmpCtx CompareContext, other Datum)
 
 	// We should never be comparing two different versions of the same enum.
 	if v.EnumTyp.TypeMeta.Version != d.EnumTyp.TypeMeta.Version {
+		var gist redact.SafeString
+		if PlanGistFromCtx != nil {
+			// Plan gist, by construction, doesn't contain any PII, so it's a
+			// safe string.
+			gist = redact.SafeString(PlanGistFromCtx(ctx))
+		}
 		panic(errors.AssertionFailedf(
-			"comparison of two different versions of enum %s oid %d: versions %d and %d",
+			"comparison of two different versions of enum %s oid %d: versions %d and %d, gist %q",
 			d.EnumTyp.SQLStringForError(), errors.Safe(d.EnumTyp.Oid()), d.EnumTyp.TypeMeta.Version,
-			v.EnumTyp.TypeMeta.Version,
+			v.EnumTyp.TypeMeta.Version, gist,
 		))
 	}