[PLATI-1143] Merge in v2.20.0 #12

felixmo · 2024-05-09T18:47:14Z

Merges v2.20.0 into our fork

This diff shows that our patches were applied fairly cleanly — some patches were moved since retryable.rb was refactored. For comparison, this diff shows how the current version is patched.

https://github.com/Appboy/platform/compare/PLATI-1143-mongo contains these changes to platform:

bulk_write monkey-patched to not raise an error if passed an empty array
Mongo::BulkWrite::Result.new updated with a new parameter
update monkey-patch of Mongo::Server::Monitor to match current implementation
adjust new max_connecting mongo client parameter to match sidekiq concurrency

…am (mongodb#2542) * RUBY-1869 allow max_await_time_ms to be passed through to change stream * RUBY-1869 fix tests * Update lib/mongo/database.rb Co-authored-by: Oleg Pudeyev <39304720+p-mongo@users.noreply.github.com> * RUBY-1869 fix tests and bson document problem * RUBY-1896 remove TODOs * RUBY-1869 fix flaky test * RUBY-1869 fix test reqs Co-authored-by: Oleg Pudeyev <39304720+p-mongo@users.noreply.github.com>

mongodb#2553) * RUBY-2468 skip tests using internet are not skipped on EXTERNAL_DISABLED=1 * RUBY-2468 fix solo tests

Co-authored-by: Oleg Pudeyev <code@olegp.name>

* The following changes are required for specs to run on Windows: - Use "timeout" instead of "timeout_interrupt" - Skip loading debug gems if neither is present * Get rid of inline rescue Co-authored-by: shields <shields@tablecheck.com>

Co-authored-by: Oleg Pudeyev <code@olegp.name>

* RUBY-2699 fix count_documents * RUBY-2699 fix count tests * RUBy-2699 finish estimated_document and distinct * RUBY-2699 add aggregate options * RUBY-2699 limit settable options on map_reduce * Apply suggestions from code review * RUBY-2699 merge all view options * RUBY-2699 add a feature flag * RUBY-2699 fix default on feature flag

* RUBY-2797 add match to aggregate * RUBY-2797 add feature flag * RUBY-2797 add match stage for view filter

* Support index wildcard_projection option * Update docs_examples_spec.rb * Fix server version-dependent spec * Add error matcher * Line breaks * fix tests Co-authored-by: shields <shields@tablecheck.com> Co-authored-by: Oleg Pudeyev <code@olegp.name>

Co-authored-by: Oleg Pudeyev <code@olegp.name>

…ics (mongodb#2560) Co-authored-by: Oleg Pudeyev <code@olegp.name>

…in our code (mongodb#2559) Co-authored-by: Oleg Pudeyev <code@olegp.name>

* Mongo::Collection::View#no_cursor_timeout regression * adjust description * add a unit test * pass no cursor timeout option to server * fix test with auth * restrict to standalones Co-authored-by: Oleg Pudeyev <code@olegp.name> Co-authored-by: Dmitry Rybakov <dmitry.rybakov@mongodb.com>

) * RUBY-3035 Reuse client in auto encrypter if unlimited pool * 3035 * 3035 * 3035 * 3035 * 3035 * close newly made clients in auto encrypter if its initialization fails * add note * add normal cleanup for newly created clients * fix pool sizes, add tests * use mrss helper for event retrieval with earlier assertions on existence of the needed events * fix command monitoring tests * collapse back into #with * fix stress test * update mrss * remove max pool size setting * redo the tests Co-authored-by: Oleg Pudeyev <code@olegp.name>

…db#2565) Co-authored-by: Oleg Pudeyev <code@olegp.name>

…ngodb#2567) * RUBY-3050 Improve reliability of SDAM heartbeat error spec tests. * RUBY-3050 change tests back

…sion" for server version > 6.0 (mongodb#2568)

* don't build tasks for latest server version for now * hmm, let's try putting 'latest' back? * RUBY-3405 make sure the cluster time is applied to new sessions * actually, probably need to get cluster time from the support client? * skip broken tests (see RUBY-3413) * ignore the serverless tests (pending RUBY-3414)

* MONGOID-5739 support BSON 5 * point at my personal branch to test this * normalize values before comparing * switch back to the official spec/shared repo * actually bump spec/shared (why are submodules so impossible?) * use pessimistic versioning

* prep for 2.20 * more CI stuff (e.g. DriverBench should run against latest stable, not latest) * let's see what happens when we enable jruby 9.4 * document added support for JRuby 9.4, and deprecation of 9.2 * flesh out the release notes more

Tagging release: 2.20.0

jasonpenny

When I try to run the specs locally with bundle exec rake, I see lots of failures (which I think has probably always been the case).

If I delete the patch in gemtester and try to run it with this version, I still get errors.

So, I think we should get our fork to be able to run all the tests (at least in gemtester at least, without having to patch it).

lib/mongo/retryable.rb

felixmo · 2024-05-15T15:49:38Z

I was able to get the tests passing in gemtester with a small patch (a few tests don't like being run inside docker)

https://github.com/braze-inc/gemtester/compare/PLATI-1143-mongo-2.20.0

jonhyman

Thanks. Note that in platform, we have a number of monkey patches under shared_code/extensions/mongo that we should either incorporate natively, or ensure are still valid post inclusion of this gem in platform.

This reverts commit 6e68474.

lib/mongo/bulk_write.rb

Neilshweky and others added 30 commits June 29, 2022 11:00

RUBY-3007 make comment its own option (mongodb#2548)

93554a7

RUBY-3024 queryType accepts a string (mongodb#2546)

3a648f1

Add docs how to run LB locally (mongodb#2550)

f7712ae

RUBY-2468 skip tests using internet with require_external_connectivity (

01f4fdc

mongodb#2553) * RUBY-2468 skip tests using internet are not skipped on EXTERNAL_DISABLED=1 * RUBY-2468 fix solo tests

RUBY-3029 Add keyAltNames prose test (mongodb#2549)

112c643

RUBY-3027 Change removeKeyAltName helper (mongodb#2551)

77b548f

Update mrss (mongodb#2554)

16dfbf2

Co-authored-by: Oleg Pudeyev <code@olegp.name>

Update drivers-evergreen-tools (mongodb#2555)

c07e3e4

Co-authored-by: Oleg Pudeyev <code@olegp.name>

RUBY-2797 Forward find conditions to View#aggregate (mongodb#2556)

9c59557

* RUBY-2797 add match to aggregate * RUBY-2797 add feature flag * RUBY-2797 add match stage for view filter

RUBY-3031 Update expected FLE 2 find payloads (mongodb#2558)

97fc200

Fix FLE assertion (mongodb#2561)

0a2e940

Co-authored-by: Oleg Pudeyev <code@olegp.name>

Show monitor addresses in to_s for background thread leakage diagnost…

b9e84a8

…ics (mongodb#2560) Co-authored-by: Oleg Pudeyev <code@olegp.name>

Use RSpec.current_example instead of duplicating that implementation …

70cb9e4

…in our code (mongodb#2559) Co-authored-by: Oleg Pudeyev <code@olegp.name>

update atlas certs

c392e46

Release 2.18.0

3e7e659

Update release notes for 2.18

2ee40a8

Name anchors in release notes

c5aa04b

Note :srv_max_hosts

b6d8d28

RUBY-3044 Fix bulk_write in transaction (mongodb#2563)

b50d12e

RUBY-3061 Script to retrieve Atlas certificates for test suite (mongo…

4a74ac7

…db#2565) Co-authored-by: Oleg Pudeyev <code@olegp.name>

RUBY-2886 Add FLE shared lib support (mongodb#2564)

0029406

RUBY-3025 Fix cursor batchSize if limit is zero (mongodb#2566)

022160e

RUBY-3050 Improve reliability of SDAM heartbeat error spec tests. (mo…

b992c29

…ngodb#2567) * RUBY-3050 Improve reliability of SDAM heartbeat error spec tests. * RUBY-3050 change tests back

RUBY-3053 update Spec test "change stream resumes after StaleShardVer…

bb2e434

…sion" for server version > 6.0 (mongodb#2568)

comandeo-mongo and others added 4 commits March 4, 2024 16:11

Use latest YARD version (mongodb#2847)

efdaddd

RUBY-3424 Prep for 2.20 (mongodb#2852)

74e4e38

* prep for 2.20 * more CI stuff (e.g. DriverBench should run against latest stable, not latest) * let's see what happens when we enable jruby 9.4 * document added support for JRuby 9.4, and deprecation of 9.2 * flesh out the release notes more

felixmo force-pushed the merge-2.20.0 branch 2 times, most recently from 8fa7f2e to 0a5b453 Compare May 9, 2024 20:27

felixmo changed the title ~~[WIP] 2.20.0~~ Merge in v2.20.0 May 14, 2024

felixmo changed the title ~~Merge in v2.20.0~~ [PLATI-1143] Merge in v2.20.0 May 14, 2024

felixmo added 2 commits May 14, 2024 17:04

Merge tag 'v2.20.0' into merge-2.20.0

3e50016

Tagging release: 2.20.0

Update retryable spec for Braze patch

3dcfcdb

felixmo force-pushed the merge-2.20.0 branch from 0a5b453 to 3dcfcdb Compare May 14, 2024 21:05

felixmo marked this pull request as ready for review May 14, 2024 21:28

felixmo requested review from a team and jonhyman May 14, 2024 21:29

jasonpenny reviewed May 15, 2024

View reviewed changes

lib/mongo/retryable.rb Outdated Show resolved Hide resolved

lib/mongo/retryable.rb Show resolved Hide resolved

felixmo added 2 commits May 15, 2024 11:41

Add back upstream change in #select_server

363066e

Add back [jontest] logging

6fb20db

felixmo requested a review from jasonpenny May 15, 2024 15:50

jonhyman approved these changes May 15, 2024

View reviewed changes

felixmo added 6 commits May 15, 2024 13:49

Update specs so that they can be run inside Docker

de7cc8a

rubocop fix

422dcf9

Don't raise error if bulk write request is empty

148a503

Clean up connection after scanning

6e68474

Revert "Clean up connection after scanning"

1f8962f

This reverts commit 6e68474.

Update tests to not expect an error if bulk write request is empty

2613693

jasonpenny reviewed May 17, 2024

View reviewed changes

lib/mongo/bulk_write.rb Show resolved Hide resolved

Add comment about empty bulk write requests

69d2199

jasonpenny approved these changes Jun 7, 2024

View reviewed changes

joelim41 merged commit 860b4ff into deployed-in-platform Jun 12, 2024
72 of 141 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PLATI-1143] Merge in v2.20.0 #12

[PLATI-1143] Merge in v2.20.0 #12

felixmo commented May 9, 2024 •

edited

Loading

jasonpenny left a comment

felixmo commented May 15, 2024 •

edited

Loading

jonhyman left a comment

[PLATI-1143] Merge in v2.20.0 #12

[PLATI-1143] Merge in v2.20.0 #12

Conversation

felixmo commented May 9, 2024 • edited Loading

jasonpenny left a comment

Choose a reason for hiding this comment

felixmo commented May 15, 2024 • edited Loading

jonhyman left a comment

Choose a reason for hiding this comment

felixmo commented May 9, 2024 •

edited

Loading

felixmo commented May 15, 2024 •

edited

Loading