Merge pull request #154754 from kyle-a-wong/blathers/backport-release-25.4-154676

kyle-a-wong · web-flow · commit e374e66dc514 · 2025-10-06T09:54:58.000-05:00
release-25.4: stmtdiagnostics: don't create statement dignostics request for txn di…
diff --git a/pkg/sql/stmtdiagnostics/statement_diagnostics.go b/pkg/sql/stmtdiagnostics/statement_diagnostics.go
@@ -653,7 +653,7 @@ func (r *Registry) innerInsertStatementDiagnostics(
 		if err != nil {
 			return diagID, err
 		}
-	} else {
+	} else if txnDiagnosticId == 0 {
 		// Insert a completed request into system.statement_diagnostics_request.
 		// This is necessary because the UI uses this table to discover completed
 		// diagnostics.

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ func (r *Registry) innerInsertStatementDiagnostics(`
`653`	`653`	`if err != nil {`
`654`	`654`	`return diagID, err`
`655`	`655`	`}`
`656`		`- } else {`
	`656`	`+ } else if txnDiagnosticId == 0 {`
`657`	`657`	`// Insert a completed request into system.statement_diagnostics_request.`
`658`	`658`	`// This is necessary because the UI uses this table to discover completed`
`659`	`659`	`// diagnostics.`