99 "time"
1010
1111 "github.com/cenkalti/backoff/v5"
12+ "github.com/n-r-w/ctxlog"
1213)
1314
1415// Informer interface for database information.
@@ -38,7 +39,7 @@ type PrepareCleanUp func(db *sql.DB, databaseName string) error
3839type testDB struct {
3940 t testing.TB
4041
41- logger Logger // unified way to logging
42+ logger ctxlog. ILogger // unified way to logging
4243
4344 databaseName string // name of the test database
4445 url * dbURL // parsed database connection string
@@ -70,13 +71,13 @@ var (
7071)
7172
7273// newTDB creates a new test database and applies migrations.
73- func newTDB (tb testing.TB , driver , dsn string , opt []Option ) * testDB {
74+ func newTDB (ctx context. Context , tb testing.TB , driver , dsn string , opt []Option ) * testDB {
7475 tb .Helper ()
7576
7677 var (
7778 db = & testDB {
7879 t : tb ,
79- logger : NewDefaultLogger ( tb ),
80+ logger : ctxlog . Must ( ctxlog . WithTesting ( tb ) ),
8081 driver : driver ,
8182 dsn : dsn ,
8283 mode : RunModeAuto ,
@@ -88,7 +89,7 @@ func newTDB(tb testing.TB, driver, dsn string, opt []Option) *testDB {
8889
8990 defer func () {
9091 if errResult != nil {
91- db . logger . Fatalf ("%v" , errResult )
92+ tb . Fatalf ("cannot create test database: %v" , errResult )
9293 }
9394 }()
9495
@@ -108,46 +109,47 @@ func newTDB(tb testing.TB, driver, dsn string, opt []Option) *testDB {
108109 defer mu .Unlock ()
109110
110111 if db .mode == RunModeDocker {
111- db .logger .Logf ( "[%s] using docker test database"db .dsnNoPass )
112- if errResult = db .createDockerResources (); errResult != nil {
112+ db .logger .Info ( ctx , " using docker test database" , "dsn "db .dsnNoPass )
113+ if errResult = db .createDockerResources (ctx ); errResult != nil {
113114 return nil
114115 }
115116 } else {
116- db .logger .Logf ( "[%s] using real test database"db .dsnNoPass )
117+ db .logger .Info ( ctx , " using real test database" , "dsn "db .dsnNoPass )
117118 }
118119
119- if errResult = db .createTestDatabase (); errResult != nil {
120- if err := db .close (); err != nil {
121- db .logger .Logf ( "[%s] failed to close test database: %v" db .dsnNoPass , err )
120+ if errResult = db .createTestDatabase (ctx ); errResult != nil {
121+ if err := db .close (ctx ); err != nil {
122+ db .logger .Info ( ctx , " failed to close test database" , "dsn" , db .dsnNoPass , "error" , err )
122123 }
123124 return nil
124125 }
125126
126127 if db .migrationsDir != "" {
127- if errResult = db .migrationsUp (); errResult != nil {
128+ if errResult = db .migrationsUp (ctx ); errResult != nil {
128129 return nil
129130 }
130131 }
131132
132133 tb .Cleanup (func () {
133- if err := db .close (); err != nil {
134- db .logger .Logf ("[%s] failed to close test database: %v" , db .dsnNoPass , err )
134+ ctx := context .Background ()
135+ if err := db .close (ctx ); err != nil {
136+ db .logger .Info (ctx , "failed to close test database" , "dsn" , db .dsnNoPass , "error" , err )
135137 } else {
136- db .logger .Logf ( "[%s] test database closed"db .dsnNoPass )
138+ db .logger .Info ( ctx , " test database closed" , "dsn "db .dsnNoPass )
137139 }
138140 })
139141
140142 return db
141143}
142144
143145// migrationsUp applies migrations to the database.
144- func (d * testDB ) migrationsUp () error {
145- d .logger .Logf ( "[%s] migrations up start"d .dsnNoPass )
146- defer d .logger .Logf ( "[%s] migrations up end"d .dsnNoPass )
146+ func (d * testDB ) migrationsUp (ctx context. Context ) error {
147+ d .logger .Info ( ctx , " migrations up start" , "dsn "d .dsnNoPass )
148+ defer d .logger .Info ( ctx , " migrations up end" , "dsn "d .dsnNoPass )
147149
148150 dsn := d .url .replaceDatabase (d .databaseName ).string (false )
149151
150- migrator , err := d .MigrateFactory (dsn , d .migrationsDir , d .logger )
152+ migrator , err := d .MigrateFactory (d . t , dsn , d .migrationsDir , d .logger )
151153 if err != nil {
152154 return fmt .Errorf ("new migrator: %w" , err )
153155 }
@@ -160,10 +162,10 @@ func (d *testDB) migrationsUp() error {
160162}
161163
162164// close closes the test database.
163- func (d * testDB ) close () error {
165+ func (d * testDB ) close (ctx context. Context ) error {
164166 if d .mode != RunModeDocker {
165167 // remove the database created before applying the migrations
166- d .logger .Logf ( "[%s] deleting test database %s" d .dsnNoPass , d .databaseName )
168+ d .logger .Info ( ctx , " deleting test database" , "dsn" , d .dsnNoPass , "database" , d .databaseName )
167169
168170 dsn := d .url .string (false )
169171 db , err := sql .Open (d .driver , dsn )
@@ -176,35 +178,35 @@ func (d *testDB) close() error {
176178
177179 for _ , prepareCleanUp := range d .prepareCleanUp {
178180 if err := prepareCleanUp (db , d .databaseName ); err != nil {
179- d .logger .Logf ( "[%s] failed to prepare clean up: %v" d .dsnNoPass , err )
181+ d .logger .Info ( ctx , " failed to prepare clean up" , "dsn" , d .dsnNoPass , "error" , err )
180182 }
181183 }
182184
183185 if _ , err = db .Exec (fmt .Sprintf ("DROP DATABASE %s" , d .databaseName )); err != nil {
184186 return fmt .Errorf ("drop db: %w" , err )
185187 }
186188
187- d .logger .Logf ( "[%s] test db %s deleted"d .dsnNoPass , d .databaseName )
189+ d .logger .Info ( ctx , " test database deleted""dsn" , d .dsnNoPass , "database" , d .databaseName )
188190 }
189191
190192 return nil
191193}
192194
193195// initDatabase creates a test database or connects to an existing one.
194- func (d * testDB ) createTestDatabase () error {
196+ func (d * testDB ) createTestDatabase (ctx context. Context ) error {
195197 if d .driver == mongoDriverName {
196198 return nil
197199 }
198200
199- return d .createSQLDatabase ()
201+ return d .createSQLDatabase (ctx )
200202}
201203
202204// retryConnect connects to the database with retries.
203- func (d * testDB ) retryConnect (info string , op func () error ) error {
205+ func (d * testDB ) retryConnect (ctx context. Context , info string , op func () error ) error {
204206 var attempt int
205207 operation := func () (struct {}, error ) {
206208 if err := op (); err != nil {
207- d .logger .Logf ( "[%s] retrying attempt %d: %v" info , attempt , err )
209+ d .logger .Info ( ctx , " retrying operation" , "info" , info , " attempt" , attempt , "error" , err )
208210 attempt ++
209211 return struct {}{}, err
210212 }
0 commit comments