Merge pull request #154258 from kyle-a-wong/blathers/backport-release-25.4-154208

release-25.4: stmtdiagnostics: add 25.4 version gate to txn diagnostics polling

Author: dhartunian

pkg/sql/stmtdiagnostics/BUILD.bazel

@@ -9,6 +9,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/stmtdiagnostics",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/multitenant",
         "//pkg/settings",
         "//pkg/settings/cluster",

pkg/sql/stmtdiagnostics/txn_diagnostics.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/appstatspb"
 	"github.com/cockroachdb/cockroach/pkg/sql/isql"
@@ -541,6 +542,10 @@ func (r *TxnRegistry) findTxnRequestLocked(requestID RequestID) bool {
 // pollTxnRequests reads the pending rows from system.transaction_diagnostics_requests and
 // updates r.mu.requests accordingly.
 func (r *TxnRegistry) pollTxnRequests(ctx context.Context) error {
+	if !r.st.Version.IsActive(ctx, clusterversion.V25_4) {
+		return nil
+	}
+
 	var rows []tree.Datums
 
 	// Loop until we run the query without straddling an epoch increment.