log: fix missing logs for internal events

previously the logs were only flowing for the non-internal events

Epic: None
Release note (bug fix): Previously, CockroachDB would not log events for
TxnRowsRead and TxnRowsWritten guardrail for internal queries into
SQL_INTERNAL_PERF channel. The bug has been present since 21.2 and
has now been fixed.

Author: jasonlmfong

pkg/sql/conn_executor_exec.go

@@ -3097,6 +3097,7 @@ func (ex *connExecutor) handleTxnRowsGuardrails(
 	if shouldLog {
 		commonSQLEventDetails := ex.planner.getCommonSQLEventDetails()
 		var event logpb.EventPayload
+		var migrator log.StructuredEventMigrator
 		if ex.executorType == executorTypeInternal {
 			if isRead {
 				event = &eventpb.TxnRowsReadLimitInternal{
@@ -3109,6 +3110,9 @@ func (ex *connExecutor) handleTxnRowsGuardrails(
 					CommonTxnRowsLimitDetails: commonTxnRowsLimitDetails,
 				}
 			}
+			migrator = log.NewStructuredEventMigrator(func() bool {
+				return log.ShouldMigrateEvent(ex.planner.ExecCfg().SV())
+			}, logpb.Channel_SQL_INTERNAL_PERF)
 		} else {
 			if isRead {
 				event = &eventpb.TxnRowsReadLimit{
@@ -3121,12 +3125,12 @@ func (ex *connExecutor) handleTxnRowsGuardrails(
 					CommonTxnRowsLimitDetails: commonTxnRowsLimitDetails,
 				}
 			}
-			migrator := log.NewStructuredEventMigrator(func() bool {
+			migrator = log.NewStructuredEventMigrator(func() bool {
 				return log.ShouldMigrateEvent(ex.planner.ExecCfg().SV())
 			}, logpb.Channel_SQL_PERF)
-			migrator.StructuredEvent(ctx, severity.INFO, event)
-			logCounter.Inc(1)
 		}
+		migrator.StructuredEvent(ctx, severity.INFO, event)
+		logCounter.Inc(1)
 	}
 	if shouldErr {
 		if isRead {

pkg/sql/row/helper.go

@@ -470,14 +470,18 @@ func (rh *RowHelper) CheckRowSize(
 			rh.metrics.MaxRowSizeLogCount.Inc(1)
 		}
 		var event logpb.EventPayload
+		var migrator log.StructuredEventMigrator
 		if rh.sd.Internal {
 			event = &eventpb.LargeRowInternal{CommonLargeRowDetails: details}
+			migrator = log.NewStructuredEventMigrator(func() bool {
+				return rh.migrateLargeRowLog
+			}, logpb.Channel_SQL_INTERNAL_PERF)
 		} else {
 			event = &eventpb.LargeRow{CommonLargeRowDetails: details}
+			migrator = log.NewStructuredEventMigrator(func() bool {
+				return rh.migrateLargeRowLog
+			}, logpb.Channel_SQL_PERF)
 		}
-		migrator := log.NewStructuredEventMigrator(func() bool {
-			return rh.migrateLargeRowLog
-		}, logpb.Channel_SQL_PERF)
 		migrator.StructuredEvent(ctx, severity.INFO, event)
 	}
 	if shouldErr {