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

Jump to bottom

PMM-7 Update pg_query_go #2965

Open
wants to merge 11 commits into
base: v3
Choose a base branch
from
Open

PMM-7 Update pg_query_go #2965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e04a337
PMM-7 Update pg_query_go
BupycHuk Apr 18, 2024
9a50129
PMM-7 Update test case
BupycHuk Apr 18, 2024
1aa4911
PMM-7 Update PostgreSQL versions
BupycHuk Apr 19, 2024
e05449d
PMM-7 Update digests
BupycHuk Apr 19, 2024
26eda56
PMM-7 Update digests
BupycHuk Apr 19, 2024
f0d6160
PMM-7 Update digests
BupycHuk Apr 19, 2024
925e581
Merge branch 'v3' into PMM-7-upgrade-pg_query_go
BupycHuk Apr 24, 2024
50b9b76
PMM-7 go mod tidy
BupycHuk Apr 24, 2024
6326524
Merge branch 'v3' into PMM-7-upgrade-pg_query_go
BupycHuk Apr 29, 2024
b8d4437
Merge branch 'v3' into PMM-7-upgrade-pg_query_go
BupycHuk Jun 25, 2024
c799df3
Merge branch 'v3' into PMM-7-upgrade-pg_query_go
BupycHuk Jul 18, 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
20 changes: 10 additions & 10 deletions .github/workflows/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
strategy:
matrix:
images:
- { mysql: 'mysql:5.6', mongo: 'mongo:4.4', postgres: 'postgres:10', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:5.7', mongo: 'mongo:4.4', postgres: 'postgres:11', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:12', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:5.6', mongo: 'mongo:4.2', postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:5.7', mongo: 'mongo:4.4', postgres: 'postgres:14', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:15', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:16', pmm_server: 'perconalab/pmm-server:3-dev-latest' }

# Percona + latest PMM Server release
- { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:11', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:12.8-pg_stat', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:13.5-pg_stat', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.2', postgres: 'perconalab/percona-distribution-postgresql:14', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:15', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:16', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }

# MariaDB (only 3 latest GA versions)
# + older supported MongoDB versions
Expand All @@ -45,9 +45,9 @@ jobs:
# - MYSQL_IMAGE=mariadb:10.0
# - MYSQL_IMAGE=mariadb:10.1

- { mysql: 'mariadb:10.2', mongo: 'mongo:4.4', postgres: 'postgres:9.4', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mariadb:10.3', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'postgres:9.5', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mariadb:10.4', postgres: 'postgres:9.6', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mariadb:10.2', mongo: 'mongo:4.4', postgres: 'postgres:10', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mariadb:10.3', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'postgres:11', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
- { mysql: 'mariadb:10.4', postgres: 'postgres:12', pmm_server: 'perconalab/pmm-server:3-dev-latest' }

continue-on-error: true

Expand Down
50 changes: 26 additions & 24 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 @@ -19,6 +19,7 @@ import (
"fmt"
"math/rand"
"os"
"strconv"
"strings"
"sync"
"testing"
Expand Down Expand Up @@ -128,16 +129,6 @@ func TestPGStatStatementsQAN(t *testing.T) {
engineVersion := tests.PostgreSQLVersion(t, sqlDB)
var digests map[string]string // digest_text/fingerprint to digest/query_id
switch engineVersion {
case "9.4":
digests = map[string]string{
selectAllCities: "3239586867",
selectAllCitiesLong: "2745128652",
}
case "9.5", "9.6":
digests = map[string]string{
selectAllCities: "3994135135",
selectAllCitiesLong: "2677760328",
}
case "10":
digests = map[string]string{
selectAllCities: "2229807896",
Expand All @@ -163,6 +154,16 @@ func TestPGStatStatementsQAN(t *testing.T) {
selectAllCities: "5991662752016701281",
selectAllCitiesLong: "-3564720362103294944",
}
case "15":
digests = map[string]string{
selectAllCities: "5991662752016701281",
selectAllCitiesLong: "-3564720362103294944",
}
case "16":
digests = map[string]string{
selectAllCities: "9094455616937907056",
selectAllCitiesLong: "-8264367755446145090",
}
default:
t.Log("Unhandled version, assuming dummy digests.")
digests = map[string]string{
Expand Down Expand Up @@ -282,9 +283,16 @@ func TestPGStatStatementsQAN(t *testing.T) {
t.Logf("Actual:\n%s", tests.FormatBuckets(buckets))
require.Len(t, buckets, 1)

expectedSharedBlksHitSum := float32(1007)
engineVersionInt, err := strconv.Atoi(engineVersion)
assert.NoError(t, err)
if engineVersionInt >= 14 {
expectedSharedBlksHitSum = 32
}

actual := buckets[0]
assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09)
assert.InDelta(t, 1010, actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 3)
assert.InDelta(t, expectedSharedBlksHitSum+3, actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 3)
assert.InDelta(t, 1.5, actual.Postgresql.MSharedBlksHitCnt+actual.Postgresql.MSharedBlksReadCnt, 0.5)
expected := &agentv1.MetricsBucket{
Common: &agentv1.MetricsBucket_Common{
Expand Down Expand Up @@ -329,7 +337,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
actual = buckets[0]
assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09)
assert.InDelta(t, 0, actual.Postgresql.MBlkReadTimeCnt, 1)
assert.InDelta(t, 1007, actual.Postgresql.MSharedBlksHitSum, 2)
assert.InDelta(t, expectedSharedBlksHitSum, actual.Postgresql.MSharedBlksHitSum, 2)
expected = &agentv1.MetricsBucket{
Common: &agentv1.MetricsBucket_Common{
Fingerprint: selectAllCitiesLong,
Expand All @@ -349,7 +357,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
Postgresql: &agentv1.MetricsBucket_PostgreSQL{
MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt,
MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum,
MSharedBlksHitCnt: 1,
MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt,
MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum,
MRowsCnt: 1,
MRowsSum: 499,
Expand Down Expand Up @@ -397,18 +405,9 @@ func TestPGStatStatementsQAN(t *testing.T) {
t.Logf("Actual:\n%s", tests.FormatBuckets(buckets))
require.Len(t, buckets, 1)

var fingerprint string
tables := []string{tableName}
fingerprint := fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES ($1, $2, $3, $4)`, tableName)

switch engineVersion {
case "9.4", "9.5", "9.6":
fingerprint = fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES (?, ?, ?, ?)`, tableName)
tables = []string{}
default:
fingerprint = fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES ($1, $2, $3, $4)`, tableName)
}
actual := buckets[0]
assert.NotZero(t, actual.Postgresql.MBlkReadTimeSum)
expected := &agentv1.MetricsBucket{
Common: &agentv1.MetricsBucket_Common{
Queryid: actual.Common.Queryid,
Expand All @@ -426,8 +425,10 @@ func TestPGStatStatementsQAN(t *testing.T) {
MQueryTimeSum: actual.Common.MQueryTimeSum,
},
Postgresql: &agentv1.MetricsBucket_PostgreSQL{
MBlkReadTimeCnt: float32(n),
MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt,
MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum,
MBlkWriteTimeCnt: actual.Postgresql.MBlkWriteTimeCnt,
MBlkWriteTimeSum: actual.Postgresql.MBlkWriteTimeSum,
MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt,
MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum,
MSharedBlksWrittenCnt: actual.Postgresql.MSharedBlksWrittenCnt,
Expand All @@ -440,6 +441,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
MRowsSum: float32(n),
},
}
assert.InDelta(t, n, actual.Postgresql.MBlkWriteTimeCnt+actual.Postgresql.MBlkReadTimeCnt, 1)
tests.AssertBucketsEqual(t, expected, actual)
assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum)
})
Expand Down
6 changes: 2 additions & 4 deletions agent/runner/actions/postgresql_query_show_action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,12 @@ func TestPostgreSQLQueryShow(t *testing.T) {

b, err := a.Run(ctx)
require.NoError(t, err)
assert.LessOrEqual(t, 22000, len(b))
assert.LessOrEqual(t, len(b), 33668)
assert.GreaterOrEqual(t, len(b), 22000)

data, err := agentv1.UnmarshalActionQueryResult(b)
require.NoError(t, err)
t.Log(spew.Sdump(data))
assert.LessOrEqual(t, 200, len(data))
assert.LessOrEqual(t, len(data), 358)
assert.GreaterOrEqual(t, len(data), 200)

var found int
for _, m := range data {
Expand Down
5 changes: 5 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,11 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc=
go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
Expand Down
Loading