Add otel support for pgxpool (#1388)

Author: djeebus

iac/provider-gcp/nomad/configs/otel-collector.yaml

@@ -144,6 +144,7 @@ processors:
           - "client_proxy.*"
           - "Click*"
           - "otelcol.*"
+          - "pgxpool.*"
 
   filter/prometheus:
     metrics:

packages/api/go.mod

@@ -115,6 +115,7 @@ require (
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/edsrzf/mmap-go v1.2.0 // indirect
+	github.com/exaring/otelpgx v0.9.3 // indirect
 	github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect

packages/api/go.sum

@@ -2,11 +2,12 @@ package client
 
 import (
 	"context"
+	"fmt"
 
+	"github.com/exaring/otelpgx"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	_ "github.com/lib/pq"
-	"go.uber.org/zap"
 
 	database "github.com/e2b-dev/infra/packages/db/queries"
 	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
@@ -38,22 +39,29 @@ func NewClient(ctx context.Context, options ...Option) (*Client, error) {
 	// Parse the connection pool configuration
 	config, err := pgxpool.ParseConfig(databaseURL)
 	if err != nil {
-		zap.L().Error("Unable to parse database URL", zap.Error(err))
-
-		return nil, err
+		return nil, fmt.Errorf("failed to parse connection pool config: %w", err)
 	}
 
 	// Set the default number of connections
 	for _, option := range options {
 		option(config)
 	}
 
+	// expose otel traces
+	config.ConnConfig.Tracer = otelpgx.NewTracer()
+
 	// Create the connection pool
 	pool, err := pgxpool.NewWithConfig(ctx, config)
 	if err != nil {
-		zap.L().Error("Unable to create connection pool", zap.Error(err))
+		return nil, fmt.Errorf("failed to create connection pool: %w", err)
 	}
 
+	// expose otel metrics
+	if err := otelpgx.RecordStats(pool); err != nil {
+		pool.Close()
+
+		return nil, fmt.Errorf("failed to record stats: %w", err)
+	}
 	queries := database.New(pool)
 
 	return &Client{Queries: queries, conn: pool}, nil

packages/db/client/client.go

@@ -11,11 +11,11 @@ tool (
 
 require (
 	github.com/e2b-dev/infra/packages/shared v0.0.0-20250324174051-3fb806938dc1
+	github.com/exaring/otelpgx v0.9.3
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.4
 	github.com/lib/pq v1.10.9
 	github.com/pressly/goose/v3 v3.24.2
-	go.uber.org/zap v1.27.0
 )
 
 require (
@@ -34,6 +34,8 @@ require (
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.7.1 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sql-driver/mysql v1.9.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
@@ -78,11 +80,14 @@ require (
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20241112172322-ea1f63298f77 // indirect
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.104.7 // indirect
 	github.com/ziutek/mymysql v1.5.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/mock v0.5.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.42.0 // indirect
 	golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
 	golang.org/x/mod v0.27.0 // indirect

packages/db/go.mod

@@ -38,6 +38,7 @@ require (
 	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/ebitengine/purego v0.8.4 // indirect
+	github.com/exaring/otelpgx v0.9.3 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -80,8 +81,6 @@ require (
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.42.0 // indirect
 	golang.org/x/mod v0.27.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect

packages/db/go.sum

@@ -43,6 +43,7 @@ require (
 	github.com/dchest/uniuri v1.2.0 // indirect
 	github.com/dnephin/pflag v1.0.7 // indirect
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
+	github.com/exaring/otelpgx v0.9.3 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/getkin/kin-openapi v0.132.0 // indirect