Skip to content

chore: add tx metrics and logs for serialization errors #15215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 25, 2024
Merged

chore: add tx metrics and logs for serialization errors #15215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
61c466a
chore: prometheus metrics to always include db transactions
Emyrk Oct 24, 2024
3543068
chore: add tx metrics and logs for serialization errors
Emyrk Oct 24, 2024
179ee27
Add test for the logs
Emyrk Oct 24, 2024
c7e53cd
add another metric for retries
Emyrk Oct 24, 2024
e3f7006
add some tx labels
Emyrk Oct 24, 2024
d3bbe9b
spelling errors
Emyrk Oct 24, 2024
58288de
fixes
Emyrk Oct 24, 2024
3e4aa8e
fixes
Emyrk Oct 24, 2024
1781c7c
fix test
Emyrk Oct 24, 2024
3f1806c
fix sql tx references
Emyrk Oct 24, 2024
785fd6f
fix sql tx references
Emyrk Oct 24, 2024
3e41185
add tx identifiers
Emyrk Oct 25, 2024
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
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
@Emyrk
Emyrk committed Oct 24, 2024
commit 58288de464e7d6792a41c81c14bf6370f075af0b
2 changes: 1 addition & 1 deletion coderd/cryptokeys/rotate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (k *rotator) rotateKeys(ctx context.Context) error {
}
}
return nil
}, &sql.TxOptions{
}, &database.TxOptions{
Isolation: sql.LevelRepeatableRead,
})
}
Expand Down
2 changes: 1 addition & 1 deletion coderd/database/dbrollup/dbrollup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type wrapUpsertDB struct {
resume <-chan struct{}
}

func (w *wrapUpsertDB) InTx(fn func(database.Store) error, opts *sql.TxOptions) error {
func (w *wrapUpsertDB) InTx(fn func(database.Store) error, opts *database.TxOptions) error {
return w.Store.InTx(func(tx database.Store) error {
return fn(&wrapUpsertDB{Store: tx, resume: w.resume})
}, opts)
Expand Down
2 changes: 1 addition & 1 deletion coderd/wsbuilder/wsbuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ func expectDB(t *testing.T, opts ...txExpect) *dbmock.MockStore {
// we expect to be run in a transaction; we use mTx to record the
// "in transaction" calls.
mDB.EXPECT().InTx(
gomock.Any(), gomock.Eq(&sql.TxOptions{Isolation: sql.LevelRepeatableRead}),
gomock.Any(), gomock.Eq(&database.TxOptions{Isolation: sql.LevelRepeatableRead}),
).
DoAndReturn(func(f func(database.Store) error, _ *sql.TxOptions) error {
err := f(mTx)
Expand Down
4 changes: 2 additions & 2 deletions enterprise/dbcrypt/dbcrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type dbCrypt struct {
database.Store
}

func (db *dbCrypt) InTx(function func(database.Store) error, txOpts *sql.TxOptions) error {
func (db *dbCrypt) InTx(function func(database.Store) error, txOpts *database.TxOptions) error {
return db.Store.InTx(func(s database.Store) error {
return function(&dbCrypt{
primaryCipherDigest: db.primaryCipherDigest,
Expand Down Expand Up @@ -445,5 +445,5 @@ func (db *dbCrypt) ensureEncrypted(ctx context.Context) error {
ActiveKeyDigest: db.primaryCipherDigest,
Test: testValue,
})
}, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})
}, &database.TxOptions{Isolation: sql.LevelRepeatableRead})
}
Loading