Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tracelog/tracelog.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,8 @@ func (tl *TraceLog) TraceAcquireEnd(ctx context.Context, _ *pgxpool.Pool, data p
interval := endTime.Sub(acquireData.startTime)

if data.Err != nil {
if tl.shouldLog(LogLevelError) {
// Ignore context.Canceled as this is a common occurence, unless debug logging is on.
if tl.shouldLog(LogLevelDebug) || (!errors.Is(data.Err, context.Canceled) && tl.shouldLog(LogLevelError)) {
tl.Logger.Log(ctx, LogLevelError, "Acquire", map[string]any{"err": data.Err, tl.Config.TimeKey: interval})
}
return
Expand Down
73 changes: 73 additions & 0 deletions tracelog/tracelog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,79 @@ func TestLogAcquire(t *testing.T) {
require.Equal(t, tracelog.LogLevelError, logger.logs[1].lvl)
}

func TestLogAcquireEndContextCanceled(t *testing.T) {
t.Parallel()

ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
defer cancel()

logger := &testLogger{}
tracer := &tracelog.TraceLog{
Logger: logger,
LogLevel: tracelog.LogLevelError,
}

config := defaultConnTestRunner.CreateConfig(ctx, t)
poolConfig, err := pgxpool.ParseConfig(config.ConnString())
require.NoError(t, err)
poolConfig.ConnConfig.Tracer = tracer

t.Run("LogLevelError with context.Canceled", func(t *testing.T) {
t.Cleanup(logger.Clear)

pool, err := pgxpool.NewWithConfig(ctx, poolConfig)
require.NoError(t, err)
t.Cleanup(pool.Close)

ctxCanceled, cancel := context.WithCancel(ctx)
cancel()

_, err = pool.Acquire(ctxCanceled)
require.ErrorIs(t, err, context.Canceled)
require.Len(t, logger.logs, 0)
})

t.Run("LogLevelError with other error", func(t *testing.T) {
t.Cleanup(logger.Clear)

badPoolConfig, err := pgxpool.ParseConfig("host=/invalid")
require.NoError(t, err)
badPoolConfig.ConnConfig.Tracer = tracer

pool, err := pgxpool.NewWithConfig(ctx, badPoolConfig)
require.NoError(t, err)
t.Cleanup(pool.Close)

_, err = pool.Acquire(ctx)
require.Error(t, err)

logs := logger.FilterByMsg("Acquire")
require.Len(t, logs, 1)
require.Equal(t, tracelog.LogLevelError, logs[0].lvl)
})

t.Run("LogLevelDebug with context.Canceled", func(t *testing.T) {
t.Cleanup(logger.Clear)

tracer.LogLevel = tracelog.LogLevelDebug

pool, err := pgxpool.NewWithConfig(ctx, poolConfig)
require.NoError(t, err)
t.Cleanup(pool.Close)

ctxCanceled, cancel := context.WithCancel(ctx)
cancel()

_, err = pool.Acquire(ctxCanceled)
require.ErrorIs(t, err, context.Canceled)

require.Len(t, logger.logs, 1)
require.Equal(t, "Acquire", logger.logs[0].msg)
require.Equal(t, tracelog.LogLevelError, logger.logs[0].lvl)
require.Equal(t, context.Canceled, logger.logs[0].data["err"])
})
}

func TestLogRelease(t *testing.T) {
t.Parallel()

Expand Down