sql: replace statement fingerprint id construction with fingerprint id from instrumentation helper

The instrumentation helper now generates a statement fingerprint id in its
setup function and stores it in its state. Now, when fingerprint ids
are needed for sql stats collection or telemetry logging, the fingerprint
id from the instrumentation helper is used.

Epic: None
Release note: None

Author: kyle-a-wong

pkg/sql/exec_log.go

@@ -347,23 +347,7 @@ func (p *planner) maybeLogStatementInternal(
 		// overhead latency: txn/retry management, error checking, etc
 		execOverheadNanos := svcLatNanos - processingLatNanos
 
-		// If the statement was recorded by the stats collector, we can extract
-		// the statement fingerprint ID. Otherwise, we'll need to compute it from the AST.
-		stmtFingerprintID := statsCollector.StatementFingerprintID()
-		if stmtFingerprintID == 0 {
-			repQuery := p.stmt.StmtNoConstants
-			if repQuery == "" {
-				flags := tree.FmtFlags(tree.QueryFormattingForFingerprintsMask.Get(&p.execCfg.Settings.SV))
-				f := tree.NewFmtCtx(flags)
-				f.FormatNode(p.stmt.AST)
-				repQuery = f.CloseAndGetString()
-			}
-			stmtFingerprintID = appstatspb.ConstructStatementFingerprintID(
-				repQuery,
-				implicitTxn,
-				p.CurrentDatabase(),
-			)
-		}
+		stmtFingerprintID := p.instrumentation.fingerprintId
 
 		sampledQuery := getSampledQuery()
 		defer releaseSampledQuery(sampledQuery)

pkg/sql/executor_statement_metrics.go

@@ -191,8 +191,7 @@ func (ex *connExecutor) recordStatementSummary(
 	}
 	startTime := phaseTimes.GetSessionPhaseTime(sessionphase.PlannerStartExecStmt).ToUTC()
 	implicitTxn := flags.IsSet(planFlagImplicitTxn)
-	stmtFingerprintID := appstatspb.ConstructStatementFingerprintID(
-		stmt.StmtNoConstants, implicitTxn, planner.SessionData().Database)
+	stmtFingerprintID := planner.instrumentation.fingerprintId
 	autoRetryReason := ex.state.mu.autoRetryReason
 	if automaticRetryStmtCount > 0 {
 		autoRetryReason = planner.autoRetryStmtReason