Skip to content

Commit 77fd7dd

Browse files
shmsrmergify[bot]
authored andcommitted
Upgrade go.mongodb.org/mongo-driver from v1.14.0 -> v1.17.4 (#44769)
(cherry picked from commit df335f3) # Conflicts: # go.mod # go.sum
1 parent 504104c commit 77fd7dd

File tree

4 files changed

+35
-14
lines changed

4 files changed

+35
-14
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
163163
- Remove `hostname` field from zookeeper's `mntr` data stream. {pull}41887[41887]
164164
- Only fetch cluster-level index stats summary {issue}36019[36019] {pull}42901[42901]
165165
- Changed `tier_preference`, `creation_date` and `version` fields to be omitted from the resulting documents when not pulled from source indices {pull}43637[43637]
166+
- Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` to `v1.17.4` to fix connection leaks in MongoDB module {pull}44769[44769]
166167

167168
*Osquerybeat*
168169

NOTICE.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24593,11 +24593,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2459324593

2459424594
--------------------------------------------------------------------------------
2459524595
Dependency : go.mongodb.org/mongo-driver
24596-
Version: v1.14.0
24596+
Version: v1.17.4
2459724597
Licence type (autodetected): Apache-2.0
2459824598
--------------------------------------------------------------------------------
2459924599

24600-
Contents of probable licence file $GOMODCACHE/go.mongodb.org/mongo-driver@v1.14.0/LICENSE:
24600+
Contents of probable licence file $GOMODCACHE/go.mongodb.org/mongo-driver@v1.17.4/LICENSE:
2460124601

2460224602
Apache License
2460324603
Version 2.0, January 2004
@@ -52651,15 +52651,15 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0
5265152651

5265252652
--------------------------------------------------------------------------------
5265352653
Dependency : github.com/montanaflynn/stats
52654-
Version: v0.7.0
52654+
Version: v0.7.1
5265552655
Licence type (autodetected): MIT
5265652656
--------------------------------------------------------------------------------
5265752657

52658-
Contents of probable licence file $GOMODCACHE/github.com/montanaflynn/stats@v0.7.0/LICENSE:
52658+
Contents of probable licence file $GOMODCACHE/github.com/montanaflynn/stats@v0.7.1/LICENSE:
5265952659

5266052660
The MIT License (MIT)
5266152661

52662-
Copyright (c) 2014-2020 Montana Flynn (https://montanaflynn.com)
52662+
Copyright (c) 2014-2023 Montana Flynn (https://montanaflynn.com)
5266352663

5266452664
Permission is hereby granted, free of charge, to any person obtaining a copy
5266552665
of this software and associated documentation files (the "Software"), to deal
@@ -56476,11 +56476,11 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg-go/stringprep@v1.0.
5647656476

5647756477
--------------------------------------------------------------------------------
5647856478
Dependency : github.com/youmark/pkcs8
56479-
Version: v0.0.0-20201027041543-1326539a0a0a
56479+
Version: v0.0.0-20240726163527-a2c0da244d78
5648056480
Licence type (autodetected): MIT
5648156481
--------------------------------------------------------------------------------
5648256482

56483-
Contents of probable licence file $GOMODCACHE/github.com/youmark/pkcs8@v0.0.0-20201027041543-1326539a0a0a/LICENSE:
56483+
Contents of probable licence file $GOMODCACHE/github.com/youmark/pkcs8@v0.0.0-20240726163527-a2c0da244d78/LICENSE:
5648456484

5648556485
The MIT License (MIT)
5648656486

go.mod

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ require (
215215
github.com/zyedidia/generic v1.2.1
216216
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3
217217
go.elastic.co/apm/module/apmhttp/v2 v2.6.3
218+
<<<<<<< HEAD
218219
go.elastic.co/apm/v2 v2.6.3
219220
go.mongodb.org/mongo-driver v1.14.0
220221
go.opentelemetry.io/collector/component v0.114.0
@@ -227,6 +228,19 @@ require (
227228
go.opentelemetry.io/collector/otelcol v0.114.0
228229
go.opentelemetry.io/collector/pdata v1.20.0
229230
go.opentelemetry.io/collector/receiver v0.114.0
231+
=======
232+
go.elastic.co/apm/v2 v2.7.0
233+
go.mongodb.org/mongo-driver v1.17.4
234+
go.opentelemetry.io/collector/component v1.31.0
235+
go.opentelemetry.io/collector/config/configtls v1.31.0
236+
go.opentelemetry.io/collector/confmap v1.31.0
237+
go.opentelemetry.io/collector/consumer v1.31.0
238+
go.opentelemetry.io/collector/consumer/consumererror v0.125.0
239+
go.opentelemetry.io/collector/exporter/debugexporter v0.125.0
240+
go.opentelemetry.io/collector/otelcol v0.125.0
241+
go.opentelemetry.io/collector/pdata v1.31.0
242+
go.opentelemetry.io/collector/receiver v1.31.0
243+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
230244
go.uber.org/mock v0.5.0
231245
golang.org/x/term v0.30.0
232246
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28
@@ -364,7 +378,7 @@ require (
364378
github.com/moby/sys/userns v0.1.0 // indirect
365379
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
366380
github.com/modern-go/reflect2 v1.0.2 // indirect
367-
github.com/montanaflynn/stats v0.7.0 // indirect
381+
github.com/montanaflynn/stats v0.7.1 // indirect
368382
github.com/morikuni/aec v1.0.0 // indirect
369383
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
370384
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -386,7 +400,7 @@ require (
386400
github.com/tklauser/numcpus v0.6.1 // indirect
387401
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
388402
github.com/xdg-go/stringprep v1.0.4 // indirect
389-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
403+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
390404
github.com/yusufpapurcu/wmi v1.2.4 // indirect
391405
github.com/zeebo/xxh3 v1.0.2 // indirect
392406
go.elastic.co/apm/module/apmzap/v2 v2.6.3 // indirect

go.sum

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
757757
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
758758
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
759759
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
760-
github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=
761-
github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
760+
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
761+
github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
762762
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
763763
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
764764
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -922,8 +922,8 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
922922
github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
923923
github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
924924
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
925-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
926-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
925+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
926+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
927927
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
928928
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
929929
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -955,10 +955,17 @@ go.elastic.co/fastjson v1.4.0 h1:a4BXUKXZHAzjVOPrqtEx2FDsIRBCMek01vCnrtyutWs=
955955
go.elastic.co/fastjson v1.4.0/go.mod h1:ZD5um63l0/8TIdddZbL2znD83FAr2IckYa3KR7VcdNA=
956956
go.elastic.co/go-licence-detector v0.7.0 h1:qC31sfyfNcNx/zMYcLABU0ac3MbGHZgksCAb5lMDUMg=
957957
go.elastic.co/go-licence-detector v0.7.0/go.mod h1:f5ty8pjynzQD8BcS+s0qtlOGKc35/HKQxCVi8SHhV5k=
958+
<<<<<<< HEAD
958959
go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
959960
go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
960961
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
961962
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
963+
=======
964+
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
965+
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
966+
go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
967+
go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
968+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
962969
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
963970
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
964971
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -1129,7 +1136,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
11291136
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
11301137
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
11311138
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
1132-
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11331139
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11341140
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11351141
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)