diff --git a/go.mod b/go.mod index 2c79d9cc1..70616d830 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/redis/go-redis/v9 v9.7.0 github.com/rollbar/rollbar-go v1.4.5 github.com/vmihailenco/go-tinylfu v0.2.2 - go.mongodb.org/mongo-driver v1.17.2 + go.mongodb.org/mongo-driver/v2 v2.0.0 go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 @@ -105,7 +105,6 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/montanaflynn/stats v0.7.1 // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/go.sum b/go.sum index 50632d605..79d8b691e 100644 --- a/go.sum +++ b/go.sum @@ -224,8 +224,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= -github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= @@ -282,8 +280,8 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zU github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM= -go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver/v2 v2.0.0 h1:Jfd7XpdZa9yk3eY774bO7SWVb30noLSirL9nKTpavhI= +go.mongodb.org/mongo-driver/v2 v2.0.0/go.mod h1:nSjmNq4JUstE8IRZKTktLgMHM4F1fccL6HGX1yh+8RA= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= diff --git a/mongoex/healthchecks.go b/mongoex/healthchecks.go index 957a5fce5..e906a277b 100644 --- a/mongoex/healthchecks.go +++ b/mongoex/healthchecks.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/readpref" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/readpref" ) type health struct { diff --git a/mongoex/metrics.go b/mongoex/metrics.go index e6aa9256c..8b90f0b89 100644 --- a/mongoex/metrics.go +++ b/mongoex/metrics.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "go.mongodb.org/mongo-driver/event" + "go.mongodb.org/mongo-driver/v2/event" ) type poolMetrics struct { @@ -70,19 +70,19 @@ func (c *poolMetrics) updateStats(e *event.PoolEvent) { switch e.Type { case event.ConnectionClosed: c.connClosed++ - case event.PoolCreated: + case event.ConnectionPoolCreated: c.poolCreated++ case event.ConnectionCreated: c.connCreated++ - case event.GetFailed: + case event.ConnectionCheckOutFailed: c.getFailed++ - case event.GetSucceeded: + case event.ConnectionCheckedOut: c.getSucceeded++ - case event.ConnectionReturned: + case event.ConnectionCheckedIn: c.connReturned++ - case event.PoolCleared: + case event.ConnectionPoolCleared: c.poolCleared++ - case event.PoolClosedEvent: + case event.ConnectionPoolClosed: c.poolClosed++ } diff --git a/mongoex/mongo.go b/mongoex/mongo.go index 64cff8697..ef2478a02 100644 --- a/mongoex/mongo.go +++ b/mongoex/mongo.go @@ -7,8 +7,8 @@ import ( "fmt" "net/url" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" "github.com/circleci/ex/o11y" "github.com/circleci/ex/rootcerts" @@ -57,5 +57,5 @@ func New(ctx context.Context, appName string, cfg Config) (client *mongo.Client, }) } - return mongo.Connect(ctx, opts) + return mongo.Connect(opts) } diff --git a/mongoex/mongo_test.go b/mongoex/mongo_test.go index 2710e99c6..8ceea57c3 100644 --- a/mongoex/mongo_test.go +++ b/mongoex/mongo_test.go @@ -3,7 +3,7 @@ package mongoex import ( "testing" - "go.mongodb.org/mongo-driver/mongo/readpref" + "go.mongodb.org/mongo-driver/v2/mongo/readpref" "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" diff --git a/mongoex/system.go b/mongoex/system.go index 6df5157a7..eb9b6aabf 100644 --- a/mongoex/system.go +++ b/mongoex/system.go @@ -3,8 +3,8 @@ package mongoex import ( "context" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" "github.com/circleci/ex/system" ) diff --git a/mongoex/system_test.go b/mongoex/system_test.go index e2231a776..74c5b4aab 100644 --- a/mongoex/system_test.go +++ b/mongoex/system_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/readpref" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/readpref" "gotest.tools/v3/assert" "github.com/circleci/ex/system" diff --git a/testing/mongofixture/mongofixture.go b/testing/mongofixture/mongofixture.go index 8e594a90b..bc2029cbd 100644 --- a/testing/mongofixture/mongofixture.go +++ b/testing/mongofixture/mongofixture.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" "gotest.tools/v3/assert" "github.com/circleci/ex/o11y" @@ -37,7 +37,7 @@ func Setup(ctx context.Context, t testing.TB, con Connection) *Fixture { ApplyURI(con.URI). SetAppName("test") - client, err := mongo.Connect(ctx, opts) + client, err := mongo.Connect(opts) assert.Assert(t, err) t.Cleanup(func() { diff --git a/testing/mongofixture/mongofixture_test.go b/testing/mongofixture/mongofixture_test.go index cf983fb59..7199e1bd7 100644 --- a/testing/mongofixture/mongofixture_test.go +++ b/testing/mongofixture/mongofixture_test.go @@ -3,7 +3,7 @@ package mongofixture import ( "testing" - "go.mongodb.org/mongo-driver/mongo/readpref" + "go.mongodb.org/mongo-driver/v2/mongo/readpref" "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp"