refactor log/sql and upload with off gocognit linter

grishagavrin · grishagavrin · commit 73867242eb4f · 2024-02-08T22:37:40.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Refactored `log/sql.go` and extract funcs
 * Refactored `metrics/driver.go` and extract funcs
 * Refactored `metrics/sql.go` and extract funcs
 * Refactored `internal/table/retry_test.go` and extract func `retry_test.checkResultsRetryWithCustomErrors`
diff --git a/log/sql.go b/log/sql.go
@@ -14,7 +14,30 @@ func DatabaseSQL(l Logger, d trace.Detailer, opts ...Option) (t trace.DatabaseSQ
 }
 
 func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
-	t.OnConnectorConnect = func(
+	logger := l.logger
+	loggerQuery := l.logQuery
+
+	t.OnConnectorConnect = connectorConnect(logger, d)
+	t.OnConnPing = connPing(logger, d)
+	t.OnConnClose = connClose(logger, d)
+	t.OnConnBegin = connBegin(logger, d)
+	t.OnConnPrepare = connPrepare(logger, loggerQuery, d)
+	t.OnConnExec = connExec(logger, loggerQuery, d)
+	t.OnConnQuery = connQuery(logger, loggerQuery, d)
+	t.OnTxCommit = txCommit(logger, d)
+	t.OnTxRollback = txRollback(logger, d)
+	t.OnStmtClose = stmtClose(logger, d)
+	t.OnStmtExec = stmtExec(logger, loggerQuery, d)
+	t.OnStmtQuery = stmtQuery(logger, loggerQuery, d)
+
+	return t
+}
+
+func connectorConnect(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnectorConnectStartInfo) func(trace.DatabaseSQLConnectorConnectDoneInfo) {
+	return func(
 		info trace.DatabaseSQLConnectorConnectStartInfo,
 	) func(
 		trace.DatabaseSQLConnectorConnectDoneInfo,
@@ -42,8 +65,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
+}
 
-	t.OnConnPing = func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {
+func connPing(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {
+	return func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
@@ -65,7 +93,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnConnClose = func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {
+}
+
+func connClose(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {
+	return func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
@@ -87,7 +121,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnConnBegin = func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {
+}
+
+func connBegin(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {
+	return func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
@@ -109,13 +149,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnConnPrepare = func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {
+}
+
+func connPrepare(
+	l Logger,
+	loggerQuery bool,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {
+	return func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
 		ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "prepare", "stmt")
 		l.Log(ctx, "start",
-			appendFieldByCondition(l.logQuery,
+			appendFieldByCondition(loggerQuery,
 				String("query", info.Query),
 			)...,
 		)
@@ -129,7 +176,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 				)
 			} else {
 				l.Log(WithLevel(ctx, ERROR), "failed",
-					appendFieldByCondition(l.logQuery,
+					appendFieldByCondition(loggerQuery,
 						String("query", query),
 						Error(info.Error),
 						latencyField(start),
@@ -139,13 +186,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnConnExec = func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {
+}
+
+func connExec(
+	l Logger,
+	loggerQuery bool,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {
+	return func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
 		ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "exec")
 		l.Log(ctx, "start",
-			appendFieldByCondition(l.logQuery,
+			appendFieldByCondition(loggerQuery,
 				String("query", info.Query),
 			)...,
 		)
@@ -161,7 +215,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			} else {
 				m := retry.Check(info.Error)
 				l.Log(WithLevel(ctx, ERROR), "failed",
-					appendFieldByCondition(l.logQuery,
+					appendFieldByCondition(loggerQuery,
 						String("query", query),
 						Bool("retryable", m.MustRetry(idempotent)),
 						Int64("code", m.StatusCode()),
@@ -174,13 +228,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnConnQuery = func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {
+}
+
+func connQuery(
+	l Logger,
+	loggerQuery bool,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {
+	return func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {
 		if d.Details()&trace.DatabaseSQLConnEvents == 0 {
 			return nil
 		}
 		ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "query")
 		l.Log(ctx, "start",
-			appendFieldByCondition(l.logQuery,
+			appendFieldByCondition(loggerQuery,
 				String("query", info.Query),
 			)...,
 		)
@@ -196,7 +257,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			} else {
 				m := retry.Check(info.Error)
 				l.Log(WithLevel(ctx, ERROR), "failed",
-					appendFieldByCondition(l.logQuery,
+					appendFieldByCondition(loggerQuery,
 						String("query", query),
 						Bool("retryable", m.MustRetry(idempotent)),
 						Int64("code", m.StatusCode()),
@@ -209,7 +270,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnTxCommit = func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {
+}
+
+func txCommit(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {
+	return func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {
 		if d.Details()&trace.DatabaseSQLTxEvents == 0 {
 			return nil
 		}
@@ -231,7 +298,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnTxRollback = func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {
+}
+
+func txRollback(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {
+	return func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {
 		if d.Details()&trace.DatabaseSQLTxEvents == 0 {
 			return nil
 		}
@@ -253,7 +326,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnStmtClose = func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {
+}
+
+func stmtClose(
+	l Logger,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {
+	return func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {
 		if d.Details()&trace.DatabaseSQLStmtEvents == 0 {
 			return nil
 		}
@@ -275,13 +354,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnStmtExec = func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {
+}
+
+func stmtExec(
+	l Logger,
+	loggerQuery bool,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {
+	return func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {
 		if d.Details()&trace.DatabaseSQLStmtEvents == 0 {
 			return nil
 		}
 		ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "stmt", "exec")
 		l.Log(ctx, "start",
-			appendFieldByCondition(l.logQuery,
+			appendFieldByCondition(loggerQuery,
 				String("query", info.Query),
 			)...,
 		)
@@ -296,7 +382,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 				)
 			} else {
 				l.Log(WithLevel(ctx, ERROR), "failed",
-					appendFieldByCondition(l.logQuery,
+					appendFieldByCondition(loggerQuery,
 						String("query", query),
 						Error(info.Error),
 						latencyField(start),
@@ -306,13 +392,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-	t.OnStmtQuery = func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {
+}
+
+func stmtQuery(
+	l Logger,
+	loggerQuery bool,
+	d trace.Detailer,
+) func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {
+	return func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {
 		if d.Details()&trace.DatabaseSQLStmtEvents == 0 {
 			return nil
 		}
 		ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "stmt", "query")
 		l.Log(ctx, "start",
-			appendFieldByCondition(l.logQuery,
+			appendFieldByCondition(loggerQuery,
 				String("query", info.Query),
 			)...,
 		)
@@ -326,7 +419,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 				)
 			} else {
 				l.Log(WithLevel(ctx, ERROR), "failed",
-					appendFieldByCondition(l.logQuery,
+					appendFieldByCondition(loggerQuery,
 						String("query", query),
 						Error(info.Error),
 						latencyField(start),
@@ -336,6 +429,4 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 			}
 		}
 	}
-
-	return t
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+* Refactored `log/sql.go` and extract funcs
`1`	`2`	* Refactored `metrics/driver.go` and extract funcs
`2`	`3`	* Refactored `metrics/sql.go` and extract funcs
`3`	`4`	* Refactored `internal/table/retry_test.go` and extract func `retry_test.checkResultsRetryWithCustomErrors`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,30 @@ func DatabaseSQL(l Logger, d trace.Detailer, opts ...Option) (t trace.DatabaseSQ`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`17`		`- t.OnConnectorConnect = func(`
	`17`	`+ logger := l.logger`
	`18`	`+ loggerQuery := l.logQuery`
	`19`	`+`
	`20`	`+ t.OnConnectorConnect = connectorConnect(logger, d)`
	`21`	`+ t.OnConnPing = connPing(logger, d)`
	`22`	`+ t.OnConnClose = connClose(logger, d)`
	`23`	`+ t.OnConnBegin = connBegin(logger, d)`
	`24`	`+ t.OnConnPrepare = connPrepare(logger, loggerQuery, d)`
	`25`	`+ t.OnConnExec = connExec(logger, loggerQuery, d)`
	`26`	`+ t.OnConnQuery = connQuery(logger, loggerQuery, d)`
	`27`	`+ t.OnTxCommit = txCommit(logger, d)`
	`28`	`+ t.OnTxRollback = txRollback(logger, d)`
	`29`	`+ t.OnStmtClose = stmtClose(logger, d)`
	`30`	`+ t.OnStmtExec = stmtExec(logger, loggerQuery, d)`
	`31`	`+ t.OnStmtQuery = stmtQuery(logger, loggerQuery, d)`
	`32`	`+`
	`33`	`+ return t`
	`34`	`+}`
	`35`	`+`
	`36`	`+func connectorConnect(`
	`37`	`+ l Logger,`
	`38`	`+ d trace.Detailer,`
	`39`	`+) func(info trace.DatabaseSQLConnectorConnectStartInfo) func(trace.DatabaseSQLConnectorConnectDoneInfo) {`
	`40`	`+ return func(`
`18`	`41`	`info trace.DatabaseSQLConnectorConnectStartInfo,`
`19`	`42`	`) func(`
`20`	`43`	`trace.DatabaseSQLConnectorConnectDoneInfo,`
`@@ -42,8 +65,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`42`	`65`	`}`
`43`	`66`	`}`
`44`	`67`	`}`
	`68`	`+}`
`45`	`69`
`46`		`- t.OnConnPing = func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {`
	`70`	`+func connPing(`
	`71`	`+ l Logger,`
	`72`	`+ d trace.Detailer,`
	`73`	`+) func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {`
	`74`	`+ return func(info trace.DatabaseSQLConnPingStartInfo) func(trace.DatabaseSQLConnPingDoneInfo) {`
`47`	`75`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`48`	`76`	`return nil`
`49`	`77`	`}`
`@@ -65,7 +93,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`65`	`93`	`}`
`66`	`94`	`}`
`67`	`95`	`}`
`68`		`- t.OnConnClose = func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {`
	`96`	`+}`
	`97`	`+`
	`98`	`+func connClose(`
	`99`	`+ l Logger,`
	`100`	`+ d trace.Detailer,`
	`101`	`+) func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {`
	`102`	`+ return func(info trace.DatabaseSQLConnCloseStartInfo) func(trace.DatabaseSQLConnCloseDoneInfo) {`
`69`	`103`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`70`	`104`	`return nil`
`71`	`105`	`}`
`@@ -87,7 +121,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`87`	`121`	`}`
`88`	`122`	`}`
`89`	`123`	`}`
`90`		`- t.OnConnBegin = func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {`
	`124`	`+}`
	`125`	`+`
	`126`	`+func connBegin(`
	`127`	`+ l Logger,`
	`128`	`+ d trace.Detailer,`
	`129`	`+) func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {`
	`130`	`+ return func(info trace.DatabaseSQLConnBeginStartInfo) func(trace.DatabaseSQLConnBeginDoneInfo) {`
`91`	`131`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`92`	`132`	`return nil`
`93`	`133`	`}`
`@@ -109,13 +149,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`109`	`149`	`}`
`110`	`150`	`}`
`111`	`151`	`}`
`112`		`- t.OnConnPrepare = func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {`
	`152`	`+}`
	`153`	`+`
	`154`	`+func connPrepare(`
	`155`	`+ l Logger,`
	`156`	`+ loggerQuery bool,`
	`157`	`+ d trace.Detailer,`
	`158`	`+) func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {`
	`159`	`+ return func(info trace.DatabaseSQLConnPrepareStartInfo) func(trace.DatabaseSQLConnPrepareDoneInfo) {`
`113`	`160`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`114`	`161`	`return nil`
`115`	`162`	`}`
`116`	`163`	`ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "prepare", "stmt")`
`117`	`164`	`l.Log(ctx, "start",`
`118`		`- appendFieldByCondition(l.logQuery,`
	`165`	`+ appendFieldByCondition(loggerQuery,`
`119`	`166`	`String("query", info.Query),`
`120`	`167`	`)...,`
`121`	`168`	`)`
`@@ -129,7 +176,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`129`	`176`	`)`
`130`	`177`	`} else {`
`131`	`178`	`l.Log(WithLevel(ctx, ERROR), "failed",`
`132`		`- appendFieldByCondition(l.logQuery,`
	`179`	`+ appendFieldByCondition(loggerQuery,`
`133`	`180`	`String("query", query),`
`134`	`181`	`Error(info.Error),`
`135`	`182`	`latencyField(start),`
`@@ -139,13 +186,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`139`	`186`	`}`
`140`	`187`	`}`
`141`	`188`	`}`
`142`		`- t.OnConnExec = func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {`
	`189`	`+}`
	`190`	`+`
	`191`	`+func connExec(`
	`192`	`+ l Logger,`
	`193`	`+ loggerQuery bool,`
	`194`	`+ d trace.Detailer,`
	`195`	`+) func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {`
	`196`	`+ return func(info trace.DatabaseSQLConnExecStartInfo) func(trace.DatabaseSQLConnExecDoneInfo) {`
`143`	`197`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`144`	`198`	`return nil`
`145`	`199`	`}`
`146`	`200`	`ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "exec")`
`147`	`201`	`l.Log(ctx, "start",`
`148`		`- appendFieldByCondition(l.logQuery,`
	`202`	`+ appendFieldByCondition(loggerQuery,`
`149`	`203`	`String("query", info.Query),`
`150`	`204`	`)...,`
`151`	`205`	`)`
`@@ -161,7 +215,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`161`	`215`	`} else {`
`162`	`216`	`m := retry.Check(info.Error)`
`163`	`217`	`l.Log(WithLevel(ctx, ERROR), "failed",`
`164`		`- appendFieldByCondition(l.logQuery,`
	`218`	`+ appendFieldByCondition(loggerQuery,`
`165`	`219`	`String("query", query),`
`166`	`220`	`Bool("retryable", m.MustRetry(idempotent)),`
`167`	`221`	`Int64("code", m.StatusCode()),`
`@@ -174,13 +228,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`174`	`228`	`}`
`175`	`229`	`}`
`176`	`230`	`}`
`177`		`- t.OnConnQuery = func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {`
	`231`	`+}`
	`232`	`+`
	`233`	`+func connQuery(`
	`234`	`+ l Logger,`
	`235`	`+ loggerQuery bool,`
	`236`	`+ d trace.Detailer,`
	`237`	`+) func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {`
	`238`	`+ return func(info trace.DatabaseSQLConnQueryStartInfo) func(trace.DatabaseSQLConnQueryDoneInfo) {`
`178`	`239`	`if d.Details()&trace.DatabaseSQLConnEvents == 0 {`
`179`	`240`	`return nil`
`180`	`241`	`}`
`181`	`242`	`ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "conn", "query")`
`182`	`243`	`l.Log(ctx, "start",`
`183`		`- appendFieldByCondition(l.logQuery,`
	`244`	`+ appendFieldByCondition(loggerQuery,`
`184`	`245`	`String("query", info.Query),`
`185`	`246`	`)...,`
`186`	`247`	`)`
`@@ -196,7 +257,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`196`	`257`	`} else {`
`197`	`258`	`m := retry.Check(info.Error)`
`198`	`259`	`l.Log(WithLevel(ctx, ERROR), "failed",`
`199`		`- appendFieldByCondition(l.logQuery,`
	`260`	`+ appendFieldByCondition(loggerQuery,`
`200`	`261`	`String("query", query),`
`201`	`262`	`Bool("retryable", m.MustRetry(idempotent)),`
`202`	`263`	`Int64("code", m.StatusCode()),`
`@@ -209,7 +270,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`209`	`270`	`}`
`210`	`271`	`}`
`211`	`272`	`}`
`212`		`- t.OnTxCommit = func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {`
	`273`	`+}`
	`274`	`+`
	`275`	`+func txCommit(`
	`276`	`+ l Logger,`
	`277`	`+ d trace.Detailer,`
	`278`	`+) func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {`
	`279`	`+ return func(info trace.DatabaseSQLTxCommitStartInfo) func(trace.DatabaseSQLTxCommitDoneInfo) {`
`213`	`280`	`if d.Details()&trace.DatabaseSQLTxEvents == 0 {`
`214`	`281`	`return nil`
`215`	`282`	`}`
`@@ -231,7 +298,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`231`	`298`	`}`
`232`	`299`	`}`
`233`	`300`	`}`
`234`		`- t.OnTxRollback = func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {`
	`301`	`+}`
	`302`	`+`
	`303`	`+func txRollback(`
	`304`	`+ l Logger,`
	`305`	`+ d trace.Detailer,`
	`306`	`+) func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {`
	`307`	`+ return func(info trace.DatabaseSQLTxRollbackStartInfo) func(trace.DatabaseSQLTxRollbackDoneInfo) {`
`235`	`308`	`if d.Details()&trace.DatabaseSQLTxEvents == 0 {`
`236`	`309`	`return nil`
`237`	`310`	`}`
`@@ -253,7 +326,13 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`253`	`326`	`}`
`254`	`327`	`}`
`255`	`328`	`}`
`256`		`- t.OnStmtClose = func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {`
	`329`	`+}`
	`330`	`+`
	`331`	`+func stmtClose(`
	`332`	`+ l Logger,`
	`333`	`+ d trace.Detailer,`
	`334`	`+) func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {`
	`335`	`+ return func(info trace.DatabaseSQLStmtCloseStartInfo) func(trace.DatabaseSQLStmtCloseDoneInfo) {`
`257`	`336`	`if d.Details()&trace.DatabaseSQLStmtEvents == 0 {`
`258`	`337`	`return nil`
`259`	`338`	`}`
`@@ -275,13 +354,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`275`	`354`	`}`
`276`	`355`	`}`
`277`	`356`	`}`
`278`		`- t.OnStmtExec = func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {`
	`357`	`+}`
	`358`	`+`
	`359`	`+func stmtExec(`
	`360`	`+ l Logger,`
	`361`	`+ loggerQuery bool,`
	`362`	`+ d trace.Detailer,`
	`363`	`+) func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {`
	`364`	`+ return func(info trace.DatabaseSQLStmtExecStartInfo) func(trace.DatabaseSQLStmtExecDoneInfo) {`
`279`	`365`	`if d.Details()&trace.DatabaseSQLStmtEvents == 0 {`
`280`	`366`	`return nil`
`281`	`367`	`}`
`282`	`368`	`ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "stmt", "exec")`
`283`	`369`	`l.Log(ctx, "start",`
`284`		`- appendFieldByCondition(l.logQuery,`
	`370`	`+ appendFieldByCondition(loggerQuery,`
`285`	`371`	`String("query", info.Query),`
`286`	`372`	`)...,`
`287`	`373`	`)`
`@@ -296,7 +382,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`296`	`382`	`)`
`297`	`383`	`} else {`
`298`	`384`	`l.Log(WithLevel(ctx, ERROR), "failed",`
`299`		`- appendFieldByCondition(l.logQuery,`
	`385`	`+ appendFieldByCondition(loggerQuery,`
`300`	`386`	`String("query", query),`
`301`	`387`	`Error(info.Error),`
`302`	`388`	`latencyField(start),`
`@@ -306,13 +392,20 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`306`	`392`	`}`
`307`	`393`	`}`
`308`	`394`	`}`
`309`		`- t.OnStmtQuery = func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {`
	`395`	`+}`
	`396`	`+`
	`397`	`+func stmtQuery(`
	`398`	`+ l Logger,`
	`399`	`+ loggerQuery bool,`
	`400`	`+ d trace.Detailer,`
	`401`	`+) func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {`
	`402`	`+ return func(info trace.DatabaseSQLStmtQueryStartInfo) func(trace.DatabaseSQLStmtQueryDoneInfo) {`
`310`	`403`	`if d.Details()&trace.DatabaseSQLStmtEvents == 0 {`
`311`	`404`	`return nil`
`312`	`405`	`}`
`313`	`406`	`ctx := with(*info.Context, TRACE, "ydb", "database", "sql", "stmt", "query")`
`314`	`407`	`l.Log(ctx, "start",`
`315`		`- appendFieldByCondition(l.logQuery,`
	`408`	`+ appendFieldByCondition(loggerQuery,`
`316`	`409`	`String("query", info.Query),`
`317`	`410`	`)...,`
`318`	`411`	`)`
`@@ -326,7 +419,7 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`326`	`419`	`)`
`327`	`420`	`} else {`
`328`	`421`	`l.Log(WithLevel(ctx, ERROR), "failed",`
`329`		`- appendFieldByCondition(l.logQuery,`
	`422`	`+ appendFieldByCondition(loggerQuery,`
`330`	`423`	`String("query", query),`
`331`	`424`	`Error(info.Error),`
`332`	`425`	`latencyField(start),`
`@@ -336,6 +429,4 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {`
`336`	`429`	`}`
`337`	`430`	`}`
`338`	`431`	`}`
`339`		`-`
`340`		`- return t`
`341`	`432`	`}`