Skip to content

Commit ad6a14e

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 647e32e commit ad6a14e

File tree

4 files changed

+45
-10
lines changed

4 files changed

+45
-10
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
142142
- Add AWS OwningAccount support for cross account monitoring {issue}40570[40570] {pull}40691[40691]
143143
- Use namespace for GetListMetrics when exists in AWS {pull}41022[41022]
144144
- Only fetch cluster-level index stats summary {issue}36019[36019] {pull}42901[42901]
145+
- Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` to `v1.17.4` to fix connection leaks in MongoDB module {pull}44769[44769]
145146

146147
*Osquerybeat*
147148

NOTICE.txt

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

2441124411
--------------------------------------------------------------------------------
2441224412
Dependency : go.mongodb.org/mongo-driver
24413-
Version: v1.14.0
24413+
Version: v1.17.4
2441424414
Licence type (autodetected): Apache-2.0
2441524415
--------------------------------------------------------------------------------
2441624416

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

2441924419
Apache License
2442024420
Version 2.0, January 2004
@@ -50187,15 +50187,15 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0
5018750187

5018850188
--------------------------------------------------------------------------------
5018950189
Dependency : github.com/montanaflynn/stats
50190-
Version: v0.7.0
50190+
Version: v0.7.1
5019150191
Licence type (autodetected): MIT
5019250192
--------------------------------------------------------------------------------
5019350193

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

5019650196
The MIT License (MIT)
5019750197

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

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

5395353953
--------------------------------------------------------------------------------
5395453954
Dependency : github.com/youmark/pkcs8
53955-
Version: v0.0.0-20201027041543-1326539a0a0a
53955+
Version: v0.0.0-20240726163527-a2c0da244d78
5395653956
Licence type (autodetected): MIT
5395753957
--------------------------------------------------------------------------------
5395853958

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

5396153961
The MIT License (MIT)
5396253962

go.mod

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ require (
219219
github.com/zyedidia/generic v1.2.1
220220
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3
221221
go.elastic.co/apm/module/apmhttp/v2 v2.6.3
222+
<<<<<<< HEAD
222223
go.elastic.co/apm/v2 v2.6.3
223224
go.mongodb.org/mongo-driver v1.14.0
224225
go.opentelemetry.io/collector/component v0.109.0
@@ -227,6 +228,23 @@ require (
227228
go.opentelemetry.io/collector/receiver v0.109.0
228229
golang.org/x/term v0.30.0
229230
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f
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+
go.uber.org/mock v0.5.0
244+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
245+
golang.org/x/term v0.31.0
246+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a
247+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
230248
gopkg.in/natefinch/lumberjack.v2 v2.2.1
231249
)
232250

@@ -349,7 +367,7 @@ require (
349367
github.com/moby/sys/userns v0.1.0 // indirect
350368
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
351369
github.com/modern-go/reflect2 v1.0.2 // indirect
352-
github.com/montanaflynn/stats v0.7.0 // indirect
370+
github.com/montanaflynn/stats v0.7.1 // indirect
353371
github.com/morikuni/aec v1.0.0 // indirect
354372
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
355373
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -372,7 +390,7 @@ require (
372390
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
373391
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
374392
github.com/xdg-go/stringprep v1.0.4 // indirect
375-
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
393+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
376394
github.com/yusufpapurcu/wmi v1.2.4 // indirect
377395
github.com/zeebo/xxh3 v1.0.2 // indirect
378396
go.elastic.co/fastjson v1.4.0 // indirect

go.sum

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,9 +741,14 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
741741
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
742742
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
743743
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
744+
<<<<<<< HEAD
744745
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
745746
github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY/JU=
746747
github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
748+
=======
749+
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
750+
github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
751+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
747752
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
748753
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
749754
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -905,10 +910,15 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
905910
github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
906911
github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
907912
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
913+
<<<<<<< HEAD
908914
github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
909915
github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
910916
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
911917
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
918+
=======
919+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
920+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
921+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
912922
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
913923
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
914924
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -940,10 +950,17 @@ go.elastic.co/fastjson v1.4.0 h1:a4BXUKXZHAzjVOPrqtEx2FDsIRBCMek01vCnrtyutWs=
940950
go.elastic.co/fastjson v1.4.0/go.mod h1:ZD5um63l0/8TIdddZbL2znD83FAr2IckYa3KR7VcdNA=
941951
go.elastic.co/go-licence-detector v0.7.0 h1:qC31sfyfNcNx/zMYcLABU0ac3MbGHZgksCAb5lMDUMg=
942952
go.elastic.co/go-licence-detector v0.7.0/go.mod h1:f5ty8pjynzQD8BcS+s0qtlOGKc35/HKQxCVi8SHhV5k=
953+
<<<<<<< HEAD
943954
go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
944955
go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
945956
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
946957
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
958+
=======
959+
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
960+
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
961+
go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
962+
go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
963+
>>>>>>> df335f363 (Upgrade `go.mongodb.org/mongo-driver` from `v1.14.0` -> `v1.17.4` (#44769))
947964
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
948965
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
949966
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -1004,7 +1021,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
10041021
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
10051022
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
10061023
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
1007-
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
10081024
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
10091025
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
10101026
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)