fixes

Emyrk · Emyrk · commit 3e4aa8e3e0df · 2024-10-24T14:14:40.000-04:00
diff --git a/cli/server.go b/cli/server.go
@@ -718,9 +718,9 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			}
 
 			if options.DeploymentValues.Prometheus.Enable && options.DeploymentValues.Prometheus.CollectDBMetrics {
-				options.Database = dbmetrics.NewQueryMetrics(options.Database, options.PrometheusRegistry)
+				options.Database = dbmetrics.NewQueryMetrics(options.Database, options.Logger, options.PrometheusRegistry)
 			} else {
-				options.Database = dbmetrics.NewDBMetrics(options.Database, options.PrometheusRegistry)
+				options.Database = dbmetrics.NewDBMetrics(options.Database, options.Logger, options.PrometheusRegistry)
 			}
 
 			var deploymentID string
diff --git a/coderd/database/db_test.go b/coderd/database/db_test.go
@@ -27,7 +27,7 @@ func TestSerializedRetry(t *testing.T) {
 	db := database.New(sqlDB)
 
 	called := 0
-	txOpts := &sql.TxOptions{Isolation: sql.LevelSerializable}
+	txOpts := &database.TxOptions{Isolation: sql.LevelSerializable}
 	err := db.InTx(func(tx database.Store) error {
 		// Test nested error
 		return tx.InTx(func(tx database.Store) error {
diff --git a/coderd/database/tx_test.go b/coderd/database/tx_test.go
@@ -19,7 +19,7 @@ func TestReadModifyUpdate_OK(t *testing.T) {
 	mDB := dbmock.NewMockStore(gomock.NewController(t))
 
 	mDB.EXPECT().
-		InTx(gomock.Any(), &sql.TxOptions{Isolation: sql.LevelRepeatableRead}).
+		InTx(gomock.Any(), &database.TxOptions{Isolation: sql.LevelRepeatableRead}).
 		Times(1).
 		Return(nil)
 	err := database.ReadModifyUpdate(mDB, func(tx database.Store) error {
@@ -34,11 +34,11 @@ func TestReadModifyUpdate_RetryOK(t *testing.T) {
 	mDB := dbmock.NewMockStore(gomock.NewController(t))
 
 	firstUpdate := mDB.EXPECT().
-		InTx(gomock.Any(), &sql.TxOptions{Isolation: sql.LevelRepeatableRead}).
+		InTx(gomock.Any(), &database.TxOptions{Isolation: sql.LevelRepeatableRead}).
 		Times(1).
 		Return(&pq.Error{Code: pq.ErrorCode("40001")})
 	mDB.EXPECT().
-		InTx(gomock.Any(), &sql.TxOptions{Isolation: sql.LevelRepeatableRead}).
+		InTx(gomock.Any(), &database.TxOptions{Isolation: sql.LevelRepeatableRead}).
 		After(firstUpdate).
 		Times(1).
 		Return(nil)
@@ -55,7 +55,7 @@ func TestReadModifyUpdate_HardError(t *testing.T) {
 	mDB := dbmock.NewMockStore(gomock.NewController(t))
 
 	mDB.EXPECT().
-		InTx(gomock.Any(), &sql.TxOptions{Isolation: sql.LevelRepeatableRead}).
+		InTx(gomock.Any(), &database.TxOptions{Isolation: sql.LevelRepeatableRead}).
 		Times(1).
 		Return(xerrors.New("a bad thing happened"))
 
@@ -71,7 +71,7 @@ func TestReadModifyUpdate_TooManyRetries(t *testing.T) {
 	mDB := dbmock.NewMockStore(gomock.NewController(t))
 
 	mDB.EXPECT().
-		InTx(gomock.Any(), &sql.TxOptions{Isolation: sql.LevelRepeatableRead}).
+		InTx(gomock.Any(), &database.TxOptions{Isolation: sql.LevelRepeatableRead}).
 		Times(5).
 		Return(&pq.Error{Code: pq.ErrorCode("40001")})
 	err := database.ReadModifyUpdate(mDB, func(tx database.Store) error {
diff --git a/docs/reference/cli/server.md b/docs/reference/cli/server.md
diff --git a/enterprise/coderd/workspacequota.go b/enterprise/coderd/workspacequota.go
@@ -104,7 +104,7 @@ func (c *committer) CommitQuota(
 		permit = true
 		consumed = newConsumed
 		return nil
-	}, &sql.TxOptions{
+	}, &database.TxOptions{
 		Isolation: sql.LevelSerializable,
 	})
 	if err != nil {
diff --git a/enterprise/dbcrypt/cliutil.go b/enterprise/dbcrypt/cliutil.go
@@ -73,7 +73,7 @@ func Rotate(ctx context.Context, log slog.Logger, sqlDB *sql.DB, ciphers []Ciphe
 				}
 			}
 			return nil
-		}, &sql.TxOptions{
+		}, &database.TxOptions{
 			Isolation: sql.LevelRepeatableRead,
 		})
 		if err != nil {
@@ -163,7 +163,7 @@ func Decrypt(ctx context.Context, log slog.Logger, sqlDB *sql.DB, ciphers []Ciph
 				}
 			}
 			return nil
-		}, &sql.TxOptions{
+		}, &database.TxOptions{
 			Isolation: sql.LevelRepeatableRead,
 		})
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -718,9 +718,9 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`if options.DeploymentValues.Prometheus.Enable && options.DeploymentValues.Prometheus.CollectDBMetrics {`
`721`		`- options.Database = dbmetrics.NewQueryMetrics(options.Database, options.PrometheusRegistry)`
	`721`	`+ options.Database = dbmetrics.NewQueryMetrics(options.Database, options.Logger, options.PrometheusRegistry)`
`722`	`722`	`} else {`
`723`		`- options.Database = dbmetrics.NewDBMetrics(options.Database, options.PrometheusRegistry)`
	`723`	`+ options.Database = dbmetrics.NewDBMetrics(options.Database, options.Logger, options.PrometheusRegistry)`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`var deploymentID string`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func Rotate(ctx context.Context, log slog.Logger, sqlDB *sql.DB, ciphers []Ciphe`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`return nil`
`76`		`- }, &sql.TxOptions{`
	`76`	`+ }, &database.TxOptions{`
`77`	`77`	`Isolation: sql.LevelRepeatableRead,`
`78`	`78`	`})`
`79`	`79`	`if err != nil {`
`@@ -163,7 +163,7 @@ func Decrypt(ctx context.Context, log slog.Logger, sqlDB *sql.DB, ciphers []Ciph`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`return nil`
`166`		`- }, &sql.TxOptions{`
	`166`	`+ }, &database.TxOptions{`
`167`	`167`	`Isolation: sql.LevelRepeatableRead,`
`168`	`168`	`})`
`169`	`169`	`if err != nil {`