Merge #149190

craig[bot] · Abhinav1299 · craig[bot] · commit d1879b1a5774 · 2025-06-30T10:03:47.000Z
149190: pkg/util/uuid: simplify error message in UUID UnmarshalBinary method r=Abhinav1299 a=Abhinav1299 Updated the error message in the UnmarshalBinary method of the UUID struct to directly use the length of the data instead of a redaction function. Epic: CRDB-37533 Part of: CRDB-44885 Release note: None Co-authored-by: Abhinav1299 <abhinav.gupta@cockroachlabs.com>
diff --git a/pkg/util/uuid/codec.go b/pkg/util/uuid/codec.go
@@ -169,7 +169,7 @@ func (u *UUID) UnmarshalBinary(data []byte) error {
 	if len(data) != Size {
 		return errors.Newf(
 			"uuid: UUID must be exactly 16 bytes long, got %d bytes",
-			redact.SafeInt(len(data)),
+			len(data),
 		)
 	}
 	copy(u[:], data)

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func (u *UUID) UnmarshalBinary(data []byte) error {`
`169`	`169`	`if len(data) != Size {`
`170`	`170`	`return errors.Newf(`
`171`	`171`	`"uuid: UUID must be exactly 16 bytes long, got %d bytes",`
`172`		`- redact.SafeInt(len(data)),`
	`172`	`+ len(data),`
`173`	`173`	`)`
`174`	`174`	`}`
`175`	`175`	`copy(u[:], data)`