Merge pull request #7778 from planetscale/bp-7774

[9.0] make sure to not log sensitive information
vitessio · Apr 1, 2021 · 30e2981 · 30e2981
2 parents e92e363 + b720ad0
commit 30e2981
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go
@@ -157,7 +157,11 @@ func (e *Executor) Execute(ctx context.Context, method string, safeSession *Safe
 	saveSessionStats(safeSession, stmtType, result, err)
 	if result != nil && len(result.Rows) > *warnMemoryRows {
 		warnings.Add("ResultsExceeded", 1)
-		log.Warningf("%q exceeds warning threshold of max memory rows: %v", sql, *warnMemoryRows)
+		piiSafeSQL, err := sqlparser.RedactSQLQuery(sql)
+		if err != nil {
+			piiSafeSQL = logStats.StmtType
+		}
+		log.Warningf("%q exceeds warning threshold of max memory rows: %v", piiSafeSQL, *warnMemoryRows)
 	}
 
 	logStats.Send()