Skip to content

Commit 14cb37b

Browse files
ademidoffademidoff
committed
Merge branch 'v3' into PMM-7-modernize-go-tools 
2 parents c6043c2 + 9bb06be commit 14cb37b

File tree

4 files changed

+119
-66
lines changed

4 files changed

+119
-66
lines changed

‎agent/agents/postgres/pgstatstatements/pgstatstatements_test.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ func TestPGStatStatementsQAN(t *testing.T) {
8989
require.NoError(t, err)
9090
tests.LogTable(t, structs)
9191

92-
const selectAllCities = "SELECT /* AllCities:pgstatstatements controller='test' */ * FROM city"
93-
const selectAllCitiesLong = "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN " +
92+
selectAllCities := "SELECT /* AllCities:pgstatstatements controller='test' */ * FROM city"
93+
selectAllCitiesLong := "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN " +
9494
"($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, " +
9595
"$21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, " +
9696
"$41, $42, $43, $44, $45, $46, $47, $48, $49, $50, $51, $52, $53, $54, $55, $56, $57, $58, $59, $60, " +
@@ -116,7 +116,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
116116
mSharedBlksHitSum = 32
117117
}
118118
truncatedMSharedBlksHitSum := mSharedBlksHitSum
119-
119+
isTruncated := true
120120
engineVersion := tests.PostgreSQLVersion(t, sqlDB)
121121
var digests map[string]string // digest_text/fingerprint to digest/query_id
122122
switch engineVersion {
@@ -160,6 +160,14 @@ func TestPGStatStatementsQAN(t *testing.T) {
160160
selectAllCities: "1563925687573067138",
161161
selectAllCitiesLong: "-3196437048361615995",
162162
}
163+
case "18":
164+
selectAllCitiesLong = "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN ($1 /*, ... */)"
165+
truncatedMSharedBlksHitSum = float32(8)
166+
digests = map[string]string{
167+
selectAllCities: "2398197226709363629",
168+
selectAllCitiesLong: "-1570108445478818403",
169+
}
170+
isTruncated = false
163171
default:
164172
t.Log("Unhandled version, assuming dummy digests.")
165173
digests = map[string]string{
@@ -291,7 +299,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
291299
AgentId: "agent_id",
292300
PeriodStartUnixSecs: 1554116340,
293301
PeriodLengthSecs: 60,
294-
IsTruncated: true,
302+
IsTruncated: isTruncated,
295303
AgentType: inventoryv1.AgentType_AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT,
296304
NumQueries: 1,
297305
MQueryTimeCnt: 1,
@@ -337,7 +345,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
337345
AgentId: "agent_id",
338346
PeriodStartUnixSecs: 1554116340,
339347
PeriodLengthSecs: 60,
340-
IsTruncated: true,
348+
IsTruncated: isTruncated,
341349
AgentType: inventoryv1.AgentType_AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT,
342350
NumQueries: 1,
343351
MQueryTimeCnt: 1,

‎go.mod‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ require (
6060
github.com/pkg/errors v0.9.1
6161
github.com/pkg/sftp v1.13.7
6262
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
63-
github.com/prometheus/client_golang v1.23.2
64-
github.com/prometheus/common v0.66.1
63+
github.com/prometheus/client_golang v1.23.0
64+
github.com/prometheus/common v0.65.0
65+
github.com/prometheus/prometheus v0.305.0
6566
github.com/ramr/go-reaper v0.3.0
6667
github.com/robfig/cron/v3 v3.0.2-0.20210106135023-bc59245fe10e
6768
github.com/sirupsen/logrus v1.9.3
@@ -100,12 +101,15 @@ require (
100101
buf.build/go/spdx v0.2.0 // indirect
101102
buf.build/go/standard v0.1.0 // indirect
102103
cel.dev/expr v0.24.0 // indirect
103-
code.gitea.io/sdk/gitea v0.22.0 // indirect
104+
cloud.google.com/go v0.116.0 // indirect
105+
cloud.google.com/go/auth v0.16.2 // indirect
106+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
107+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
108+
cloud.google.com/go/datastore v1.20.0 // indirect
104109
connectrpc.com/connect v1.18.1 // indirect
105110
connectrpc.com/otelconnect v0.7.2 // indirect
106111
dario.cat/mergo v1.0.1 // indirect
107112
filippo.io/edwards25519 v1.1.0 // indirect
108-
github.com/42wim/httpsig v1.2.3 // indirect
109113
github.com/4meepo/tagalign v1.4.2 // indirect
110114
github.com/Abirdcfly/dupword v0.1.3 // indirect
111115
github.com/Antonboom/errname v1.0.0 // indirect
@@ -147,6 +151,7 @@ require (
147151
github.com/blizzy78/varnamelen v0.8.0 // indirect
148152
github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect
149153
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
154+
github.com/bradleyfalzon/ghinstallation/v2 v2.0.4 // indirect
150155
github.com/breml/bidichk v0.3.2 // indirect
151156
github.com/breml/errchkjson v0.4.0 // indirect
152157
github.com/bufbuild/buf v1.57.0 // indirect
@@ -156,7 +161,6 @@ require (
156161
github.com/butuzov/mirror v1.3.0 // indirect
157162
github.com/catenacyber/perfsprint v0.8.2 // indirect
158163
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
159-
github.com/cespare/xxhash v1.1.0 // indirect
160164
github.com/charithe/durationcheck v0.0.10 // indirect
161165
github.com/chavacava/garif v0.1.0 // indirect
162166
github.com/chigopher/pathlib v0.19.1 // indirect
@@ -171,7 +175,6 @@ require (
171175
github.com/curioswitch/go-reassign v0.3.0 // indirect
172176
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
173177
github.com/daixiang0/gci v0.13.6 // indirect
174-
github.com/davidmz/go-pageant v1.0.2 // indirect
175178
github.com/denis-tingaikin/go-header v0.5.0 // indirect
176179
github.com/denisenkom/go-mssqldb v0.9.0 // indirect
177180
github.com/dennwc/varint v1.0.0 // indirect
@@ -196,13 +199,9 @@ require (
196199
github.com/go-critic/go-critic v0.12.0 // indirect
197200
github.com/go-delve/delve v1.25.0 // indirect
198201
github.com/go-delve/liner v1.2.3-0.20231231155935-4726ab1d7f62 // indirect
199-
github.com/go-fed/httpsig v1.1.0 // indirect
200202
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
201203
github.com/go-git/go-billy/v5 v5.6.0 // indirect
202204
github.com/go-git/go-git/v5 v5.13.0 // indirect
203-
github.com/go-kit/kit v0.12.0 // indirect
204-
github.com/go-kit/log v0.2.1 // indirect
205-
github.com/go-logfmt/logfmt v0.6.0 // indirect
206205
github.com/go-logr/logr v1.4.3 // indirect
207206
github.com/go-logr/stdr v1.2.2 // indirect
208207
github.com/go-openapi/inflect v0.21.0 // indirect
@@ -221,6 +220,7 @@ require (
221220
github.com/gobwas/glob v0.2.3 // indirect
222221
github.com/gofrs/flock v0.12.1 // indirect
223222
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect
223+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
224224
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
225225
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
226226
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -239,10 +239,13 @@ require (
239239
github.com/google/go-containerregistry v0.20.6 // indirect
240240
github.com/google/go-dap v0.12.0 // indirect
241241
github.com/google/go-github/v33 v33.0.0 // indirect
242-
github.com/google/go-github/v64 v64.0.0 // indirect
242+
github.com/google/go-github/v39 v39.2.0 // indirect
243+
github.com/google/go-github/v41 v41.0.0 // indirect
243244
github.com/google/go-querystring v1.1.0 // indirect
244245
github.com/google/licensecheck v0.3.1 // indirect
245-
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
246+
github.com/google/s2a-go v0.1.9 // indirect
247+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
248+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
246249
github.com/gordonklaus/ineffassign v0.1.0 // indirect
247250
github.com/gorilla/handlers v1.5.2 // indirect
248251
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
@@ -257,7 +260,6 @@ require (
257260
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
258261
github.com/hashicorp/hcl v1.0.0 // indirect
259262
github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01 // indirect
260-
github.com/haya14busa/go-sarif v0.0.0-20240630170108-a3ba8d79599f // indirect
261263
github.com/hexops/gotextdiff v1.0.3 // indirect
262264
github.com/huandu/xstrings v1.4.0 // indirect
263265
github.com/iancoleman/strcase v0.3.0 // indirect
@@ -323,8 +325,6 @@ require (
323325
github.com/pjbgf/sha1cd v0.3.0 // indirect
324326
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
325327
github.com/posener/complete v1.2.3 // indirect
326-
github.com/prometheus/prometheus v0.305.0 // indirect
327-
github.com/prometheus/tsdb v0.7.1 // indirect
328328
github.com/quasilyte/go-consistent v0.6.0 // indirect
329329
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
330330
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
@@ -386,6 +386,7 @@ require (
386386
github.com/vbatts/tar-split v0.12.1 // indirect
387387
github.com/vburenin/ifacemaker v1.2.1 // indirect
388388
github.com/vektra/mockery/v2 v2.53.2 // indirect
389+
github.com/vvakame/sdlog v0.0.0-20200409072131-7c0d359efddc // indirect
389390
github.com/xanzy/go-gitlab v0.114.0 // indirect
390391
github.com/xanzy/ssh-agent v0.3.3 // indirect
391392
github.com/xen0n/gosmopolitan v1.2.2 // indirect
@@ -400,25 +401,27 @@ require (
400401
go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect
401402
go.lsp.dev/protocol v0.12.0 // indirect
402403
go.lsp.dev/uri v0.3.0 // indirect
404+
go.opencensus.io v0.24.0 // indirect
403405
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
406+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
404407
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
405-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
406408
go.opentelemetry.io/otel/metric v1.37.0 // indirect
407409
go.uber.org/atomic v1.11.0 // indirect
408410
go.uber.org/automaxprocs v1.6.0 // indirect
409411
go.uber.org/mock v0.6.0 // indirect
410412
go.uber.org/multierr v1.11.0 // indirect
411413
go.uber.org/zap v1.27.0 // indirect
412-
go.yaml.in/yaml/v2 v2.4.2 // indirect
413414
golang.org/x/arch v0.11.0 // indirect
414-
golang.org/x/build v0.0.0-20250902193327-e6a76329f415 // indirect
415+
golang.org/x/build v0.0.0-20200616162219-07bebbe343e9 // indirect
415416
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
416417
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
417418
golang.org/x/oauth2 v0.31.0 // indirect
418419
golang.org/x/perf v0.0.0-20250909190841-7e13e04d9366 // indirect
419420
golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488 // indirect
420421
golang.org/x/term v0.35.0 // indirect
421422
golang.org/x/time v0.12.0 // indirect
423+
google.golang.org/api v0.238.0 // indirect
424+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
422425
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
423426
gopkg.in/ini.v1 v1.67.0 // indirect
424427
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)