add tx identifiers

Emyrk · Emyrk · commit 3e411857e3b3 · 2024-10-25T09:17:51.000-04:00
diff --git a/coderd/cryptokeys/rotate.go b/coderd/cryptokeys/rotate.go
@@ -162,7 +162,8 @@ func (k *rotator) rotateKeys(ctx context.Context) error {
 			}
 			return nil
 		}, &database.TxOptions{
-			Isolation: sql.LevelRepeatableRead,
+			Isolation:    sql.LevelRepeatableRead,
+			TxIdentifier: "rotate_keys",
 		})
 }
 
diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go
@@ -66,7 +66,7 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.
 			logger.Info(ctx, "purged old database entries", slog.F("duration", clk.Since(start)))
 
 			return nil
-		}, nil); err != nil {
+		}, database.DefaultTXOptions().WithID("db_purge")); err != nil {
 			logger.Error(ctx, "failed to purge old database entries", slog.Error(err))
 			return
 		}
diff --git a/coderd/database/dbrollup/dbrollup.go b/coderd/database/dbrollup/dbrollup.go
@@ -108,7 +108,7 @@ func (r *Rolluper) start(ctx context.Context) {
 
 				ev.TemplateUsageStats = true
 				return tx.UpsertTemplateUsageStats(ctx)
-			}, nil)
+			}, database.DefaultTXOptions().WithID("db_rollup"))
 		})
 
 		err := eg.Wait()
diff --git a/enterprise/coderd/workspacequota.go b/enterprise/coderd/workspacequota.go
@@ -105,7 +105,8 @@ func (c *committer) CommitQuota(
 		consumed = newConsumed
 		return nil
 	}, &database.TxOptions{
-		Isolation: sql.LevelSerializable,
+		Isolation:    sql.LevelSerializable,
+		TxIdentifier: "commit_quota",
 	})
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ func (k *rotator) rotateKeys(ctx context.Context) error {`
`162`	`162`	`}`
`163`	`163`	`return nil`
`164`	`164`	`}, &database.TxOptions{`
`165`		`- Isolation: sql.LevelRepeatableRead,`
	`165`	`+ Isolation: sql.LevelRepeatableRead,`
	`166`	`+ TxIdentifier: "rotate_keys",`
`166`	`167`	`})`
`167`	`168`	`}`
`168`	`169`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.`
`66`	`66`	`logger.Info(ctx, "purged old database entries", slog.F("duration", clk.Since(start)))`
`67`	`67`
`68`	`68`	`return nil`
`69`		`- }, nil); err != nil {`
	`69`	`+ }, database.DefaultTXOptions().WithID("db_purge")); err != nil {`
`70`	`70`	`logger.Error(ctx, "failed to purge old database entries", slog.Error(err))`
`71`	`71`	`return`
`72`	`72`	`}`