From 3b3db3ca863b42e7def66eb1580fd473895cd704 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 9 Jun 2023 11:51:19 +0300
Subject: [PATCH] Remove endLog to make CallerSkipFrame consistent

---
 util/dbutil/connlog.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/util/dbutil/connlog.go b/util/dbutil/connlog.go
index 1998024a..03c30e9a 100644
--- a/util/dbutil/connlog.go
+++ b/util/dbutil/connlog.go
@@ -106,7 +106,10 @@ type LoggingTxn struct {
 func (lt *LoggingTxn) Commit() error {
 	start := time.Now()
 	err := lt.UnderlyingTx.Commit()
-	lt.endLog()
+	lt.EndTime = time.Now()
+	if !lt.noTotalLog {
+		lt.db.Log.QueryTiming(lt.ctx, "<Transaction>", "", nil, -1, lt.EndTime.Sub(lt.StartTime), nil)
+	}
 	lt.db.Log.QueryTiming(lt.ctx, "Commit", "", nil, -1, time.Since(start), err)
 	return err
 }
@@ -114,16 +117,12 @@ func (lt *LoggingTxn) Commit() error {
 func (lt *LoggingTxn) Rollback() error {
 	start := time.Now()
 	err := lt.UnderlyingTx.Rollback()
-	lt.endLog()
-	lt.db.Log.QueryTiming(lt.ctx, "Rollback", "", nil, -1, time.Since(start), err)
-	return err
-}
-
-func (lt *LoggingTxn) endLog() {
 	lt.EndTime = time.Now()
 	if !lt.noTotalLog {
 		lt.db.Log.QueryTiming(lt.ctx, "<Transaction>", "", nil, -1, lt.EndTime.Sub(lt.StartTime), nil)
 	}
+	lt.db.Log.QueryTiming(lt.ctx, "Rollback", "", nil, -1, time.Since(start), err)
+	return err
 }
 
 type LoggingRows struct {