Skip to content

Commit

Permalink
upgrade crdbx to use pgx/v5 and include stdlib (#218)
Browse files Browse the repository at this point in the history
This upgrades crdbx to use pgx/v5 and ensures the pgx/v5 library is
loaded.

Signed-off-by: Mike Mason <mimason@equinix.com>
  • Loading branch information
mikemrm authored Apr 4, 2024
1 parent d575b84 commit 818bb30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 139 deletions.
5 changes: 3 additions & 2 deletions crdbx/crdbx.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
"fmt"

"github.com/XSAM/otelsql"
_ "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgx" // crdb retries and postgres interface
_ "github.com/lib/pq" // Register the Postgres driver.
_ "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgxv5" // crdb retries and postgres interface
_ "github.com/jackc/pgx/v5/stdlib" // Register pgx driver.
_ "github.com/lib/pq" // Register the Postgres driver.
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
)

Expand Down
6 changes: 0 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,8 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // 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/pgx/v4 v4.18.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/labstack/echo v3.3.10+incompatible
github.com/leodido/go-urn v1.4.0 // indirect
Expand Down
Loading

0 comments on commit 818bb30

Please sign in to comment.