go.d postgres github.com/jackc/pgx/v5 (netdata#18062)

webfutureiorepo · Jul 2, 2024 · 62a004b · 62a004b
1 parent c573ad7
commit 62a004b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 146 deletions.
diff --git a/src/go/go.mod b/src/go/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/gosnmp/gosnmp v1.37.0
 	github.com/ilyam8/hashstructure v1.1.0
-	github.com/jackc/pgx/v4 v4.18.3
+	github.com/jackc/pgx/v5 v5.6.0
 	github.com/jessevdk/go-flags v1.6.1
 	github.com/kanocz/fcgi_client v0.0.0-20210113082628-fff85c8adfb7
 	github.com/likexian/whois v1.15.3
@@ -88,13 +88,9 @@ require (
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.14.3 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

diff --git a/src/go/go.sum b/src/go/go.sum
diff --git a/src/go/plugin/go.d/modules/pgbouncer/collect.go b/src/go/plugin/go.d/modules/pgbouncer/collect.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/blang/semver/v4"
-	"github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/stdlib"
 )
 
 // 'SHOW STATS;' response was changed significantly in v1.8.0
@@ -264,7 +264,7 @@ func (p *PgBouncer) openConnection() error {
 	if err != nil {
 		return err
 	}
-	cfg.PreferSimpleProtocol = true
+	cfg.DefaultQueryExecMode = pgx.QueryExecModeSimpleProtocol
 
 	db, err := sql.Open("pgx", stdlib.RegisterConnConfig(cfg))
 	if err != nil {

diff --git a/src/go/plugin/go.d/modules/pgbouncer/pgbouncer.go b/src/go/plugin/go.d/modules/pgbouncer/pgbouncer.go
@@ -12,7 +12,7 @@ import (
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 
 	"github.com/blang/semver/v4"
-	_ "github.com/jackc/pgx/v4/stdlib"
+	_ "github.com/jackc/pgx/v5/stdlib"
 )
 
 //go:embed "config_schema.json"

diff --git a/src/go/plugin/go.d/modules/postgres/collect.go b/src/go/plugin/go.d/modules/postgres/collect.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/stdlib"
 )
 
 const (

diff --git a/src/go/plugin/go.d/modules/postgres/do_query_misc.go b/src/go/plugin/go.d/modules/postgres/do_query_misc.go
@@ -6,7 +6,7 @@ import (
 	"database/sql"
 	"strconv"
 
-	"github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5/stdlib"
 )
 
 func (p *Postgres) doQueryServerVersion() (int, error) {

diff --git a/src/go/plugin/go.d/modules/postgres/postgres.go b/src/go/plugin/go.d/modules/postgres/postgres.go
@@ -14,8 +14,8 @@ import (
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/metrics"
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 
-	"github.com/jackc/pgx/v4/stdlib"
-	_ "github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5/stdlib"
+	_ "github.com/jackc/pgx/v5/stdlib"
 )
 
 //go:embed "config_schema.json"