Skip to content
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

PMM-13579 Fix truncate of queries. #3419

Open
wants to merge 3 commits into
base: v3
Choose a base branch
from
+10 −8
Open

PMM-13579 Fix truncate of queries. #3419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a90a95c
PMM-13579 Fix truncate of queries.
BupycHuk Dec 26, 2024
b784179
Merge branch 'v3' into PMM-13579-fix-truncate-of-queries
BupycHuk Dec 26, 2024
1f2694d
PMM-13579 Fix tests.
BupycHuk Dec 26, 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
1 change: 1 addition & 0 deletions agent/agents/postgres/pgstatstatements/pg_stat_statements_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ type pgStatStatementsExtended struct {
Tables []string
IsQueryTruncated bool
Comments map[string]string
RealQuery string // RealQuery is a query which is not truncated, it's not sent to API and stored only locally in memory.
}

func (e *pgStatStatementsExtended) String() string {
Expand Down
13 changes: 7 additions & 6 deletions agent/agents/postgres/pgstatstatements/pgstatstatements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (m *PGStatStatementsQAN) Run(ctx context.Context) {
var err error
m.changes <- agents.Change{Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING}

if current, _, err := m.getStatStatementsExtended(ctx, m.q, m.maxQueryLength); err == nil {
if current, _, err := m.getStatStatementsExtended(ctx); err == nil {
if err = m.statementsCache.Set(current); err == nil {
m.l.Debugf("Got %d initial stat statements.", len(current))
running = true
Expand Down Expand Up @@ -204,8 +204,6 @@ func (m *PGStatStatementsQAN) Run(ctx context.Context) {
// and the previous cashed state.
func (m *PGStatStatementsQAN) getStatStatementsExtended(
ctx context.Context,
q *reform.Querier,
maxQueryLength int32,
) (statementsMap, statementsMap, error) {
var totalN, newN, newSharedN, oldN int
var err error
Expand All @@ -221,6 +219,8 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended(
return nil, nil, err
}

q := m.q

// load all databases and usernames first as we can't use querier while iterating over rows below
databases := queryDatabases(q)
usernames := queryUsernames(q)
Expand Down Expand Up @@ -251,6 +251,7 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended(
pgStatStatements: *row,
Database: databases[row.DBID],
Username: usernames[row.UserID],
RealQuery: row.Query,
}

if p := prev[c.QueryID]; p != nil {
Expand All @@ -262,7 +263,7 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended(
} else {
newN++

c.Query, c.IsQueryTruncated = truncate.Query(c.Query, maxQueryLength, truncate.GetDefaultMaxQueryLength())
c.Query, c.IsQueryTruncated = truncate.Query(c.Query, m.maxQueryLength, truncate.GetDefaultMaxQueryLength())
}

current[c.QueryID] = c
Expand All @@ -278,7 +279,7 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended(
}

func (m *PGStatStatementsQAN) getNewBuckets(ctx context.Context, periodStart time.Time, periodLengthSecs uint32) ([]*agentv1.MetricsBucket, error) {
current, prev, err := m.getStatStatementsExtended(ctx, m.q, m.maxQueryLength)
current, prev, err := m.getStatStatementsExtended(ctx)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -336,7 +337,7 @@ func (m *PGStatStatementsQAN) makeBuckets(current, prev statementsMap) []*agentv
}

if len(currentPSS.Tables) == 0 {
currentPSS.Tables = extractTables(currentPSS.Query, m.maxQueryLength, l)
currentPSS.Tables = extractTables(currentPSS.RealQuery, m.maxQueryLength, l)
}

if !m.disableCommentsParsing {
Expand Down
4 changes: 2 additions & 2 deletions agent/agents/postgres/pgstatstatements/pgstatstatements_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
Common: &agentv1.MetricsBucket_Common{
Fingerprint: selectAllCitiesLong,
Database: "pmm-agent",
Tables: []string{},
Tables: []string{"city"},
Comments: map[string]string{"controller": "test"},
Username: "pmm-agent",
AgentId: "agent_id",
Expand Down Expand Up @@ -331,7 +331,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
Common: &agentv1.MetricsBucket_Common{
Fingerprint: selectAllCitiesLong,
Database: "pmm-agent",
Tables: []string{},
Tables: []string{"city"},
Comments: map[string]string{"controller": "test"},
Username: "pmm-agent",
AgentId: "agent_id",
Expand Down
Loading