Merge pull request #134594 from rafiss/backport23.2-134347

release-23.2: jobs: don't redact job ID in log tags
cockroachdb · Nov 8, 2024 · a13ff5f · a13ff5f
2 parents f3ba201 + 9a848ee
commit a13ff5f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/jobs/registry.go b/pkg/jobs/registry.go
@@ -44,6 +44,7 @@ import (
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/errors/oserror"
 	"github.com/cockroachdb/logtags"
+	"github.com/cockroachdb/redact"
 )
 
 // adoptedJobs represents the epoch and cancellation of a job id being run by
@@ -1697,8 +1698,7 @@ func (r *Registry) stepThroughStateMachine(
 			return errors.NewAssertionErrorWithWrappedErrf(jobErr,
 				"job %d: resuming with non-nil error", job.ID())
 		}
-		resumeCtx := logtags.AddTag(ctx, "job",
-			fmt.Sprintf("%s id=%d", jobType, job.ID()))
+		resumeCtx := logtags.AddTag(ctx, "job", redact.Sprintf("%s id=%d", jobType, job.ID()))
 		// Adding all tags as pprof labels (including the one we just added for job
 		// type and id).
 		resumeCtx, undo := pprofutil.SetProfilerLabelsFromCtxTags(resumeCtx)