sqlstats: add FingerprintID to sqlstats.RecordedTxnStats

This commit adds the `FingerprintID` field to sqlstats.RecordedTxnStats.

Epic: none
Part of: #141024

Release note: None

Author: xinhaoz

pkg/sql/conn_executor_exec.go

@@ -4330,6 +4330,7 @@ func (ex *connExecutor) recordTransactionFinish(
 	commitLat := ex.phaseTimes.GetCommitLatency()
 
 	recordedTxnStats := sqlstats.RecordedTxnStats{
+		FingerprintID:           transactionFingerprintID,
 		SessionID:               ex.planner.extendedEvalCtx.SessionID,
 		TransactionID:           ev.txnID,
 		TransactionTimeSec:      elapsedTime.Seconds(),
@@ -4376,11 +4377,7 @@ func (ex *connExecutor) recordTransactionFinish(
 		)
 	}
 
-	return ex.statsCollector.RecordTransaction(
-		ctx,
-		transactionFingerprintID,
-		recordedTxnStats,
-	)
+	return ex.statsCollector.RecordTransaction(ctx, recordedTxnStats)
 }
 
 // Records a SERIALIZATION_CONFLICT contention event to the contention registry event

pkg/sql/sqlstats/persistedsqlstats/bench_test.go

@@ -412,8 +412,10 @@ func BenchmarkSqlStatsMaxFlushTime(b *testing.B) {
 		}
 
 		for i := int64(1); i <= txnFingerprintLimit; i++ {
-			mockTxnValue := sqlstats.RecordedTxnStats{}
-			err := appContainer.RecordTransaction(ctx, appstatspb.TransactionFingerprintID(i), mockTxnValue)
+			mockTxnValue := sqlstats.RecordedTxnStats{
+				FingerprintID: appstatspb.TransactionFingerprintID(i),
+			}
+			err := appContainer.RecordTransaction(ctx, mockTxnValue)
 			if errors.Is(err, ssmemstorage.ErrFingerprintLimitReached) {
 				break
 			}

pkg/sql/sqlstats/sslocal/sql_stats_test.go

@@ -475,7 +475,8 @@ func TestExplicitTxnFingerprintAccounting(t *testing.T) {
 			statsCollector.EndTransaction(ctx, txnFingerprintID)
 			require.NoError(t,
 				statsCollector.
-					RecordTransaction(ctx, txnFingerprintID, sqlstats.RecordedTxnStats{
+					RecordTransaction(ctx, sqlstats.RecordedTxnStats{
+						FingerprintID: txnFingerprintID,
 						SessionData: &sessiondata.SessionData{
 							SessionData: sessiondatapb.SessionData{
 								UserProto:       username.RootUserName().EncodeProto(),
@@ -607,7 +608,8 @@ func TestAssociatingStmtStatsWithTxnFingerprint(t *testing.T) {
 
 			transactionFingerprintID := appstatspb.TransactionFingerprintID(txnFingerprintIDHash.Sum())
 			statsCollector.EndTransaction(ctx, transactionFingerprintID)
-			err := statsCollector.RecordTransaction(ctx, transactionFingerprintID, sqlstats.RecordedTxnStats{
+			err := statsCollector.RecordTransaction(ctx, sqlstats.RecordedTxnStats{
+				FingerprintID: transactionFingerprintID,
 				SessionData: &sessiondata.SessionData{
 					SessionData: sessiondatapb.SessionData{
 						UserProto:       username.RootUserName().EncodeProto(),

pkg/sql/sqlstats/sslocal/sslocal_stats_collector.go

@@ -284,9 +284,7 @@ func (s *StatsCollector) observeStatement(value sqlstats.RecordedStmtStats) {
 
 // observeTransaction sends the recorded transaction stats to the insights system
 // for further processing.
-func (s *StatsCollector) observeTransaction(
-	txnFingerprintID appstatspb.TransactionFingerprintID, value sqlstats.RecordedTxnStats,
-) {
+func (s *StatsCollector) observeTransaction(value sqlstats.RecordedTxnStats) {
 	if !s.sendInsights {
 		return
 	}
@@ -315,7 +313,7 @@ func (s *StatsCollector) observeTransaction(
 
 	insight := insights.Transaction{
 		ID:              value.TransactionID,
-		FingerprintID:   txnFingerprintID,
+		FingerprintID:   value.FingerprintID,
 		UserPriority:    value.Priority.String(),
 		ImplicitTxn:     value.ImplicitTxn,
 		Contention:      &value.ExecStats.ContentionTime,
@@ -359,9 +357,9 @@ func (s *StatsCollector) RecordStatement(
 // RecordTransaction records the statistics of a transaction.
 // Transaction stats are always recorded directly on the flushTarget.
 func (s *StatsCollector) RecordTransaction(
-	ctx context.Context, key appstatspb.TransactionFingerprintID, value sqlstats.RecordedTxnStats,
+	ctx context.Context, value sqlstats.RecordedTxnStats,
 ) error {
-	s.observeTransaction(key, value)
+	s.observeTransaction(value)
 
 	// TODO(117690): Unify StmtStatsEnable and TxnStatsEnable into a single cluster setting.
 	if !sqlstats.TxnStatsEnable.Get(&s.st.SV) {
@@ -374,7 +372,7 @@ func (s *StatsCollector) RecordTransaction(
 	if t > 0 {
 		return nil
 	}
-	return s.flushTarget.RecordTransaction(ctx, key, value)
+	return s.flushTarget.RecordTransaction(ctx, value)
 }
 
 func (s *StatsCollector) IterateStatementStats(

pkg/sql/sqlstats/ssmemstorage/ss_mem_writer.go

@@ -182,13 +182,11 @@ func (s *Container) TrySetStatementSampled(
 }
 
 // RecordTransaction saves per-transaction statistics.
-func (s *Container) RecordTransaction(
-	ctx context.Context, key appstatspb.TransactionFingerprintID, value sqlstats.RecordedTxnStats,
-) error {
+func (s *Container) RecordTransaction(ctx context.Context, value sqlstats.RecordedTxnStats) error {
 	s.recordTransactionHighLevelStats(value.TransactionTimeSec, value.Committed, value.ImplicitTxn)
 
 	// Get the statistics object.
-	stats, created, throttled := s.tryCreateStatsForTxnWithKey(key, value.StatementFingerprintIDs)
+	stats, created, throttled := s.tryCreateStatsForTxnWithKey(value.FingerprintID, value.StatementFingerprintIDs)
 
 	if throttled {
 		return ErrFingerprintLimitReached
@@ -205,14 +203,14 @@ func (s *Container) RecordTransaction(
 	// fingerprints for this app. We also abort the operation and return an error.
 	if created {
 		estimatedMemAllocBytes :=
-			stats.sizeUnsafeLocked() + key.Size() + 8 /* hash of transaction key */
+			stats.sizeUnsafeLocked() + value.FingerprintID.Size() + 8 /* hash of transaction key */
 		if err := func() error {
 			// If the monitor is nil, we do not track memory usage.
 			if s.acc != nil {
 				if err := s.acc.Grow(ctx, estimatedMemAllocBytes); err != nil {
 					s.mu.Lock()
 					defer s.mu.Unlock()
-					delete(s.mu.txns, key)
+					delete(s.mu.txns, value.FingerprintID)
 					return ErrMemoryPressure
 				}
 			}

pkg/sql/sqlstats/ssmemstorage/ss_mem_writer_test.go

@@ -65,7 +65,9 @@ func TestRecordTransaction(t *testing.T) {
 			nil,
 		)
 		// Record a transaction, ensure no insights are generated.
-		require.NoError(t, memContainer.RecordTransaction(ctx, appstatspb.TransactionFingerprintID(123), sqlstats.RecordedTxnStats{}))
+		require.NoError(t, memContainer.RecordTransaction(ctx, sqlstats.RecordedTxnStats{
+			FingerprintID: appstatspb.TransactionFingerprintID(123),
+		}))
 	})
 }
 
@@ -122,6 +124,7 @@ func TestContainer_Add(t *testing.T) {
 		// Add some transaction stats to the source container
 		txnFingerprintID := appstatspb.TransactionFingerprintID(123)
 		txnStats := sqlstats.RecordedTxnStats{
+			FingerprintID:  txnFingerprintID,
 			RowsAffected:   10,
 			ServiceLatency: 1,
 			RetryLatency:   2,
@@ -132,7 +135,7 @@ func TestContainer_Add(t *testing.T) {
 			RowsWritten:    5,
 			BytesRead:      100,
 		}
-		require.NoError(t, src.RecordTransaction(ctx, txnFingerprintID, txnStats))
+		require.NoError(t, src.RecordTransaction(ctx, txnStats))
 
 		// In the src destination, these 'reduced' entries will have
 		// 0 values.
@@ -159,6 +162,7 @@ func TestContainer_Add(t *testing.T) {
 		}
 		reducedTxnFingerprintID := appstatspb.TransactionFingerprintID(321)
 		reducedTxnStats := sqlstats.RecordedTxnStats{
+			FingerprintID:  reducedTxnFingerprintID,
 			RowsAffected:   100,
 			ServiceLatency: 500 * time.Millisecond,
 			RetryLatency:   100 * time.Millisecond,
@@ -170,11 +174,13 @@ func TestContainer_Add(t *testing.T) {
 			BytesRead:      100,
 		}
 		require.NoError(t, dest.RecordStatement(ctx, reducedStmtStats))
-		require.NoError(t, dest.RecordTransaction(ctx, reducedTxnFingerprintID, reducedTxnStats))
+		require.NoError(t, dest.RecordTransaction(ctx, reducedTxnStats))
 		require.NoError(t, src.RecordStatement(ctx, sqlstats.RecordedStmtStats{
 			FingerprintID: appstatspb.StmtFingerprintID(321),
 		}))
-		require.NoError(t, src.RecordTransaction(ctx, reducedTxnFingerprintID, sqlstats.RecordedTxnStats{}))
+		require.NoError(t, src.RecordTransaction(ctx, sqlstats.RecordedTxnStats{
+			FingerprintID: reducedTxnFingerprintID,
+		}))
 
 		for i := 0; i < 10; i++ {
 			require.NoError(t, dest.Add(ctx, src))
@@ -316,10 +322,11 @@ func TestContainerMemoryAccountClearing(t *testing.T) {
 	require.NoError(t, err)
 
 	// Record a transaction to allocate more memory.
-	txnKey := appstatspb.TransactionFingerprintID(100)
-	txnStats := sqlstats.RecordedTxnStats{}
+	txnStats := sqlstats.RecordedTxnStats{
+		FingerprintID: appstatspb.TransactionFingerprintID(100),
+	}
 
-	err = container.RecordTransaction(ctx, txnKey, txnStats)
+	err = container.RecordTransaction(ctx, txnStats)
 	require.NoError(t, err)
 
 	// Verify memory is allocated

pkg/sql/sqlstats/ssprovider.go

@@ -97,6 +97,7 @@ type RecordedStmtStats struct {
 
 // RecordedTxnStats stores the statistics of a transaction to be recorded.
 type RecordedTxnStats struct {
+	FingerprintID           appstatspb.TransactionFingerprintID
 	SessionID               clusterunique.ID
 	TransactionID           uuid.UUID
 	TransactionTimeSec      float64