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
fix test
  • Loading branch information
@Emyrk
Emyrk committed Oct 24, 2024
commit 1781c7c80437b4b27a33c726e1319a4b68eb0ad4
4 changes: 3 additions & 1 deletion cli/testdata/coder_server_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ INTROSPECTION / PROMETHEUS OPTIONS:
Collect agent stats (may increase charges for metrics storage).

--prometheus-collect-db-metrics bool, $CODER_PROMETHEUS_COLLECT_DB_METRICS (default: false)
Collect database metrics (may increase charges for metrics storage).
Collect database query metrics (may increase charges for metrics
storage). If set to false, a reduced set of database metrics are still
collected.

--prometheus-enable bool, $CODER_PROMETHEUS_ENABLE
Serve prometheus metrics on the address defined by prometheus address.
Expand Down
3 changes: 2 additions & 1 deletion cli/testdata/server-config.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ introspection:
- template_name
- username
- workspace_name
# Collect database metrics (may increase charges for metrics storage).
# Collect database query metrics (may increase charges for metrics storage). If
# set to false, a reduced set of database metrics are still collected.
# (default: false, type: bool)
collect_db_metrics: false
pprof:
Expand Down
4 changes: 3 additions & 1 deletion enterprise/cli/testdata/coder_server_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ INTROSPECTION / PROMETHEUS OPTIONS:
Collect agent stats (may increase charges for metrics storage).

--prometheus-collect-db-metrics bool, $CODER_PROMETHEUS_COLLECT_DB_METRICS (default: false)
Collect database metrics (may increase charges for metrics storage).
Collect database query metrics (may increase charges for metrics
storage). If set to false, a reduced set of database metrics are still
collected.

--prometheus-enable bool, $CODER_PROMETHEUS_ENABLE
Serve prometheus metrics on the address defined by prometheus address.
Expand Down
2 changes: 1 addition & 1 deletion enterprise/dbcrypt/dbcrypt_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ func TestEncryptDecryptField(t *testing.T) {

func expectInTx(mdb *dbmock.MockStore) *gomock.Call {
return mdb.EXPECT().InTx(gomock.Any(), gomock.Any()).Times(1).DoAndReturn(
func(f func(store database.Store) error, _ *sql.TxOptions) error {
func(f func(store database.Store) error, _ *database.TxOptions) error {
return f(mdb)
},
)
Expand Down
Loading