sqlstats: reduce stats collector calls from conn exec

Previously, separate functions in the stats collector were required to
send execution statistics for statements and transactions to sqlstats
and insights respectively.

This commit consolidates the sending of execution events to sqlstats
and insights into one function on the stats collector per event type
(one for statements and one for transactions).

Epic: none
Part of: #141024
Release note: None

Author: xinhaoz

pkg/sql/conn_executor_exec.go

@@ -4376,8 +4376,6 @@ func (ex *connExecutor) recordTransactionFinish(
 		)
 	}
 
-	ex.statsCollector.ObserveTransaction(ctx, transactionFingerprintID, recordedTxnStats)
-
 	return ex.statsCollector.RecordTransaction(
 		ctx,
 		transactionFingerprintID,

pkg/sql/executor_statement_metrics.go

@@ -235,8 +235,6 @@ func (ex *connExecutor) recordStatementSummary(
 		}
 	}
 
-	ex.statsCollector.ObserveStatement(stmtFingerprintID, recordedStmtStats)
-
 	// Do some transaction level accounting for the transaction this statement is
 	// a part of.
 

pkg/sql/sqlstats/insights/ingester.go

@@ -51,8 +51,8 @@ type eventBufChPayload struct {
 	events        *eventBuffer
 }
 
-// ConcurrentBufferIngester buffers the "events" it sees (via ObserveStatement
-// and ObserveTransaction) and passes them along to the underlying registry
+// ConcurrentBufferIngester buffers the "events" it sees (via observeStatement
+// and observeTransaction) and passes them along to the underlying registry
 // once its buffer is full. (Or once a timeout has passed, for low-traffic
 // clusters and tests.)
 //

pkg/sql/sqlstats/sslocal/sslocal_stats_collector.go

@@ -39,7 +39,8 @@ type bufferedStmtStats []sqlstats.RecordedStmtStats
 //
 //  2. The insights subsystem (insightsWriter) which is used to
 //     persist statement and transaction insights to an in-memory cache.
-//     Events are sent to the insights subsystem for async processing.
+//     Events are sent to the insights subsystem for async processing in
+//     observeStatement() and observeTransaction() respectively.
 type StatsCollector struct {
 
 	// stmtBuf contains the current transaction's statement
@@ -227,11 +228,9 @@ func (s *StatsCollector) shouldObserveInsights() bool {
 	return sqlstats.StmtStatsEnable.Get(&s.st.SV) && sqlstats.TxnStatsEnable.Get(&s.st.SV)
 }
 
-// ObserveStatement sends the recorded statement stats to the insights system
+// observeStatement sends the recorded statement stats to the insights system
 // for further processing.
-func (s *StatsCollector) ObserveStatement(
-	stmtFingerprintID appstatspb.StmtFingerprintID, value sqlstats.RecordedStmtStats,
-) {
+func (s *StatsCollector) observeStatement(value sqlstats.RecordedStmtStats) {
 	if !s.sendInsights {
 		return
 	}
@@ -257,7 +256,7 @@ func (s *StatsCollector) ObserveStatement(
 
 	insight := insights.Statement{
 		ID:                   value.StatementID,
-		FingerprintID:        stmtFingerprintID,
+		FingerprintID:        value.FingerprintID,
 		LatencyInSeconds:     value.ServiceLatencySec,
 		Query:                value.Query,
 		Status:               getInsightStatus(value.StatementError),
@@ -283,12 +282,10 @@ func (s *StatsCollector) ObserveStatement(
 	}
 }
 
-// ObserveTransaction sends the recorded transaction stats to the insights system
+// observeTransaction sends the recorded transaction stats to the insights system
 // for further processing.
-func (s *StatsCollector) ObserveTransaction(
-	_ctx context.Context,
-	txnFingerprintID appstatspb.TransactionFingerprintID,
-	value sqlstats.RecordedTxnStats,
+func (s *StatsCollector) observeTransaction(
+	txnFingerprintID appstatspb.TransactionFingerprintID, value sqlstats.RecordedTxnStats,
 ) {
 	if !s.sendInsights {
 		return
@@ -344,6 +341,8 @@ func (s *StatsCollector) ObserveTransaction(
 func (s *StatsCollector) RecordStatement(
 	ctx context.Context, value sqlstats.RecordedStmtStats,
 ) error {
+	s.observeStatement(value)
+
 	// TODO(xinhaoz): This isn't the best place to set this, but we'll clean this up
 	// when we refactor the stats collection code to send the stats to an ingester.
 	s.stmtFingerprintID = value.FingerprintID
@@ -362,6 +361,8 @@ func (s *StatsCollector) RecordStatement(
 func (s *StatsCollector) RecordTransaction(
 	ctx context.Context, key appstatspb.TransactionFingerprintID, value sqlstats.RecordedTxnStats,
 ) error {
+	s.observeTransaction(key, value)
+
 	// TODO(117690): Unify StmtStatsEnable and TxnStatsEnable into a single cluster setting.
 	if !sqlstats.TxnStatsEnable.Get(&s.st.SV) {
 		return nil