-
Notifications
You must be signed in to change notification settings - Fork 468
Db-O11y: Removing unnecessary samples from pg samples, adding user field to pg wait events #4491
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.
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
+20
−34
Merged
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
11d5883
removing unnecessary fields from samples, adding user to wait events
gaantunes c3f60a1
fix
gaantunes 66e192b
lint
gaantunes da57727
Merge branch 'main' into gaantunes/pg-reduce-sample-noise
gaantunes ebc3f16
update changelog
gaantunes 842694f
cleanup change
gaantunes b71fc12
Merge branch 'main' into gaantunes/pg-reduce-sample-noise
gaantunes 0635475
update changelog
gaantunes f921f38
update changelog
gaantunes 9c4411f
update changelog
gaantunes 4d538e3
nit
gaantunes 7ea5492
nit
gaantunes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,6 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| stateChangeTime := now.Add(-10 * time.Second) // 10 seconds ago | ||
| queryStartTime := now.Add(-30 * time.Second) // 30 seconds ago | ||
| xactStartTime := now.Add(-2 * time.Minute) // 2 minutes ago | ||
| backendStartTime := now.Add(-1 * time.Hour) // 1 hour ago | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
|
|
@@ -44,14 +43,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, "testdb", 100, sql.NullInt64{}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "client backend", backendStartTime, sql.NullInt32{Int32: 500, Valid: true}, sql.NullInt32{Int32: 400, Valid: true}, | ||
| "client backend", sql.NullInt32{Int32: 500, Valid: true}, sql.NullInt32{Int32: 400, Valid: true}, | ||
| xactStartTime, "active", stateChangeTime, sql.NullString{}, | ||
| sql.NullString{}, nil, queryStartTime, sql.NullInt64{Int64: 123, Valid: true}, | ||
| "SELECT * FROM users", | ||
|
|
@@ -62,7 +61,7 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| {"op": OP_QUERY_SAMPLE}, | ||
| }, | ||
| expectedLines: []string{ | ||
| `level="info" datname="testdb" pid="100" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" backend_time="1h0m0s" xid="500" xmin="400" xact_time="2m0s" state="active" query_time="30s" queryid="123" query="SELECT * FROM users" engine="postgres" cpu_time="10s"`, | ||
| `level="info" datname="testdb" pid="100" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" xid="500" xmin="400" xact_time="2m0s" state="active" query_time="30s" queryid="123" query="SELECT * FROM users" engine="postgres" cpu_time="10s"`, | ||
| }, | ||
| }, | ||
| { | ||
|
|
@@ -72,14 +71,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, "testdb", 101, sql.NullInt64{Int64: 100, Valid: true}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "parallel worker", now, sql.NullInt32{}, sql.NullInt32{}, | ||
| "parallel worker", sql.NullInt32{}, sql.NullInt32{}, | ||
| now, "active", now, sql.NullString{}, | ||
| sql.NullString{}, nil, now, sql.NullInt64{Int64: 123, Valid: true}, | ||
| "SELECT * FROM large_table", | ||
|
|
@@ -90,8 +89,7 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| {"op": OP_QUERY_SAMPLE}, | ||
| }, | ||
| expectedLines: []string{ | ||
| fmt.Sprintf(`level="info" datname="testdb" pid="101" leader_pid="100" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="parallel worker" backend_time="%s" xid="0" xmin="0" xact_time="%s" state="active" query_time="%s" queryid="123" query="SELECT * FROM large_table" engine="postgres" cpu_time="%s"`, | ||
| time.Duration(0).String(), | ||
| fmt.Sprintf(`level="info" datname="testdb" pid="101" leader_pid="100" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="parallel worker" xid="0" xmin="0" xact_time="%s" state="active" query_time="%s" queryid="123" query="SELECT * FROM large_table" engine="postgres" cpu_time="%s"`, | ||
| time.Duration(0).String(), | ||
| time.Duration(0).String(), | ||
| time.Duration(0).String(), | ||
|
|
@@ -105,14 +103,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, "testdb", 102, sql.NullInt64{}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "client backend", backendStartTime, sql.NullInt32{}, sql.NullInt32{}, | ||
| "client backend", sql.NullInt32{}, sql.NullInt32{}, | ||
| xactStartTime, "waiting", stateChangeTime, sql.NullString{String: "Lock", Valid: true}, | ||
| sql.NullString{String: "relation", Valid: true}, pq.Int64Array{103, 104}, now, sql.NullInt64{Int64: 124, Valid: true}, | ||
| "UPDATE users SET status = 'active'", | ||
|
|
@@ -124,8 +122,8 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| {"op": OP_WAIT_EVENT}, | ||
| }, | ||
| expectedLines: []string{ | ||
| `level="info" datname="testdb" pid="102" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" backend_time="1h0m0s" xid="0" xmin="0" xact_time="2m0s" state="waiting" query_time="0s" queryid="124" query="UPDATE users SET status = ?" engine="postgres"`, | ||
| `level="info" datname="testdb" backend_type="client backend" state="waiting" wait_time="10s" wait_event_type="Lock" wait_event="relation" wait_event_name="Lock:relation" blocked_by_pids="[103 104]" queryid="124" query="UPDATE users SET status = ?" engine="postgres"`, | ||
| `level="info" datname="testdb" pid="102" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" xid="0" xmin="0" xact_time="2m0s" state="waiting" query_time="0s" queryid="124" query="UPDATE users SET status = ?" engine="postgres"`, | ||
| `level="info" datname="testdb" user="testuser" backend_type="client backend" state="waiting" wait_time="10s" wait_event_type="Lock" wait_event="relation" wait_event_name="Lock:relation" blocked_by_pids="[103 104]" queryid="124" query="UPDATE users SET status = ?" engine="postgres"`, | ||
| }, | ||
| }, | ||
| { | ||
|
|
@@ -135,14 +133,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, "testdb", 103, sql.NullInt64{}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "client backend", now, sql.NullInt32{}, sql.NullInt32{}, | ||
| "client backend", sql.NullInt32{}, sql.NullInt32{}, | ||
| now, "active", now, sql.NullString{}, | ||
| sql.NullString{}, nil, now, sql.NullInt64{Int64: 125, Valid: true}, | ||
| "<insufficient privilege>", | ||
|
|
@@ -159,14 +157,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, sql.NullString{Valid: false}, 104, sql.NullInt64{}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "client backend", now, sql.NullInt32{}, sql.NullInt32{}, | ||
| "client backend", sql.NullInt32{}, sql.NullInt32{}, | ||
| now, "active", now, sql.NullString{}, | ||
| sql.NullString{}, nil, now, sql.NullInt64{Int64: 126, Valid: true}, | ||
| "SELECT * FROM users", | ||
|
|
@@ -183,14 +181,14 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| WillReturnRows(sqlmock.NewRows([]string{ | ||
| "now", "datname", "pid", "leader_pid", | ||
| "usename", "application_name", "client_addr", "client_port", | ||
| "backend_type", "backend_start", "backend_xid", "backend_xmin", | ||
| "backend_type", "backend_xid", "backend_xmin", | ||
| "xact_start", "state", "state_change", "wait_event_type", | ||
| "wait_event", "blocked_by_pids", "query_start", "query_id", | ||
| "query", | ||
| }).AddRow( | ||
| now, "testdb", 106, sql.NullInt64{}, | ||
| "testuser", "testapp", "127.0.0.1", 5432, | ||
| "client backend", backendStartTime, sql.NullInt32{}, sql.NullInt32{}, | ||
| "client backend", sql.NullInt32{}, sql.NullInt32{}, | ||
| xactStartTime, "active", stateChangeTime, sql.NullString{}, | ||
| sql.NullString{}, nil, queryStartTime, sql.NullInt64{Int64: 128, Valid: true}, | ||
| "SELECT * FROM users WHERE id = 123 AND email = '[email protected]'", | ||
|
|
@@ -201,7 +199,7 @@ func TestQuerySamples_FetchQuerySamples(t *testing.T) { | |
| {"op": OP_QUERY_SAMPLE}, | ||
| }, | ||
| expectedLines: []string{ | ||
| `level="info" datname="testdb" pid="106" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" backend_time="1h0m0s" xid="0" xmin="0" xact_time="2m0s" state="active" query_time="30s" queryid="128" query="SELECT * FROM users WHERE id = 123 AND email = '[email protected]'" engine="postgres" cpu_time="10s"`, | ||
| `level="info" datname="testdb" pid="106" leader_pid="" user="testuser" app="testapp" client="127.0.0.1:5432" backend_type="client backend" xid="0" xmin="0" xact_time="2m0s" state="active" query_time="30s" queryid="128" query="SELECT * FROM users WHERE id = 123 AND email = '[email protected]'" engine="postgres" cpu_time="10s"`, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.