mongo 2.15.0 → 2.18.1

data/lib/mongo/socket/ocsp_verifier.rb

@@ -237,49 +237,17 @@ module Mongo
           return false
         end
 
-        if resp.respond_to?(:find_response)
-          # Ruby 2.4+
-          resp = resp.find_response(cert_id)
-          # TODO make a new class instead of patching the stdlib one?
-          resp.instance_variable_set('@uri', uri)
-          resp.instance_variable_set('@original_uri', original_uri)
-          class << resp
-            attr_reader :uri, :original_uri
-          end
-        else
-          # Ruby 2.3
-          found = nil
-          resp.status.each do |_cert_id, cert_status, revocation_reason, revocation_time, this_update, next_update, extensions|
-            if _cert_id.cmp(cert_id)
-              found = OpenStruct.new(
-                cert_status: cert_status,
-                certid: _cert_id,
-                next_update: next_update,
-                this_update: this_update,
-                revocation_reason: revocation_reason,
-                revocation_time: revocation_time,
-                extensions: extensions,
-                uri: uri,
-                original_uri: original_uri,
-              )
-              class << found
-                # Unlike the stdlib method, this one doesn't accept
-                # any arguments.
-                def check_validity
-                  now = Time.now
-                  this_update <= now && next_update >= now
-                end
-              end
-              break
-            end
-          end
-          resp = found
-        end
-
+        resp = resp.find_response(cert_id)
         unless resp
           @resp_errors << "OCSP response from #{report_uri(original_uri, uri)} did not include information about the requested certificate"
           return false
         end
+        # TODO make a new class instead of patching the stdlib one?
+        resp.instance_variable_set('@uri', uri)
+        resp.instance_variable_set('@original_uri', original_uri)
+        class << resp
+          attr_reader :uri, :original_uri
+        end
 
         unless resp.check_validity
           @resp_errors << "OCSP response from #{report_uri(original_uri, uri)} was invalid: this_update was in the future or next_update time has passed"

data/lib/mongo/socket/tcp.rb

@@ -46,6 +46,9 @@ module Mongo
       # @since 2.0.0
       # @api private
       def initialize(host, port, timeout, family, options = {})
+        if family.nil?
+          raise ArgumentError, 'family must be specified'
+        end
         super(timeout, options)
         @host, @port = host, port
         @family = family

data/lib/mongo/socket.rb

@@ -362,11 +362,7 @@ module Mongo
     end
 
     def allocate_string(capacity)
-      if RUBY_VERSION >= '2.4.0'
-        String.new('', :capacity => capacity, :encoding => 'BINARY')
-      else
-        ('x'*capacity).force_encoding('BINARY')
-      end
+      String.new('', :capacity => capacity, :encoding => 'BINARY')
     end
 
     def read_buffer_size

data/lib/mongo/srv/resolver.rb

@@ -29,6 +29,16 @@ module Mongo
       #   before querying SRV records.
       RECORD_PREFIX = '_mongodb._tcp.'.freeze
 
+      # Generates the record prefix with a custom SRV service name if it is
+      # provided.
+      #
+      # @option srv_service_name [ String | nil ] The SRV service name to use
+      #   in the record prefix.
+      # @return [ String ] The generated record prefix.
+      def record_prefix(srv_service_name=nil)
+        return srv_service_name ? "_#{srv_service_name}._tcp." : RECORD_PREFIX
+      end
+
       # Creates a new Resolver.
       #
       # @option opts [ Float ] :timeout The timeout, in seconds, to use for
@@ -51,13 +61,18 @@ module Mongo
         options[:timeout] || Monitor::DEFAULT_TIMEOUT
       end
 
-      # Obtains all of the SRV records for a given hostname.
+      # Obtains all of the SRV records for a given hostname. If a srv_max_hosts
+      # is specified and it is greater than 0, return maximum srv_max_hosts records.
       #
       # In the event that a record with a mismatched domain is found or no
       # records are found, if the :raise_on_invalid option is true,
       # an exception will be raised, otherwise a warning will be logged.
       #
       # @param [ String ] hostname The hostname whose records should be obtained.
+      # @param [ String | nil ] srv_service_name The SRV service name for the DNS query.
+      #   If nil, 'mongodb' is used.
+      # @param [ Integer | nil ] srv_max_hosts The maximum number of records to return.
+      #   If this value is nil, return all of the records.
       #
       # @raise [ Mongo::Error::MismatchedDomain ] If the :raise_in_invalid
       #   Resolver option is true and a record with a domain name that does
@@ -66,8 +81,8 @@ module Mongo
       #   option is true and no records are found.
       #
       # @return [ Mongo::Srv::Result ] SRV lookup result.
-      def get_records(hostname)
-        query_name = RECORD_PREFIX + hostname
+      def get_records(hostname, srv_service_name=nil, srv_max_hosts=nil)
+        query_name = record_prefix(srv_service_name) + hostname
         resources = @resolver.getresources(query_name, Resolv::DNS::Resource::IN::SRV)
 
         # Collect all of the records into a Result object, raising an error
@@ -97,6 +112,12 @@ module Mongo
           end
         end
 
+        # if srv_max_hosts is in [1, #addresses)
+        if (1...result.address_strs.length).include? srv_max_hosts
+          sampled_records = resources.shuffle.first(srv_max_hosts)
+          result = Srv::Result.new(hostname)
+          sampled_records.each { |record| result.add_record(record) }
+        end
         result
       end
 

data/lib/mongo/uri/options_mapper.rb

@@ -268,6 +268,9 @@ module Mongo
       # Topology options
       uri_option 'directConnection', :direct_connection, type: :bool
       uri_option 'connect', :connect, type: :symbol
+      uri_option 'loadBalanced', :load_balanced, type: :bool
+      uri_option 'srvMaxHosts', :srv_max_hosts, type: :integer
+      uri_option 'srvServiceName', :srv_service_name
 
       # Auth Options
       uri_option 'authSource', :auth_source

data/lib/mongo/uri/srv_protocol.rb

@@ -80,7 +80,7 @@ module Mongo
       DOT_PARTITION = '.'.freeze
 
       # @return [ Array<String> ] VALID_TXT_OPTIONS The valid options for a TXT record to specify.
-      VALID_TXT_OPTIONS = ['replicaset', 'authsource'].freeze
+      VALID_TXT_OPTIONS = %w(replicaset authsource loadbalanced).freeze
 
       # @return [ String ] INVALID_HOST Error message format string indicating that the hostname in
       #   in the URI does not fit the expected form.
@@ -102,11 +102,6 @@ module Mongo
       #   were found.
       NO_SRV_RECORDS = "The DNS query returned no SRV records for '%s'".freeze
 
-      # @return [ String ] INVALID_TXT_RECORD_OPTION Error message format string indicating that an
-      #   unexpected TXT record option was found.
-      INVALID_TXT_RECORD_OPTION = "TXT records can only specify the options " +
-                                    "[#{VALID_TXT_OPTIONS.join(', ')}].".freeze
-
       # @return [ String ] FORMAT The expected SRV URI format.
       FORMAT = 'mongodb+srv://[username:password@]host[/[database][?options]]'.freeze
 
@@ -152,7 +147,7 @@ module Mongo
         validate_srv_hostname(hostname)
         @query_hostname = hostname
 
-        @srv_result = resolver.get_records(hostname)
+        @srv_result = resolver.get_records(hostname, uri_options[:srv_service_name], uri_options[:srv_max_hosts])
         if srv_result.empty?
           raise Error::NoSRVRecords.new(NO_SRV_RECORDS % hostname)
         end
@@ -222,8 +217,11 @@ module Mongo
       def parse_txt_options!(string)
         string.split(INDIV_URI_OPTS_DELIM).reduce({}) do |txt_options, opt|
           raise Error::InvalidTXTRecord.new(INVALID_OPTS_VALUE_DELIM) unless opt.index(URI_OPTS_VALUE_DELIM)
-          key, value = opt.split(URI_OPTS_VALUE_DELIM)
-          raise Error::InvalidTXTRecord.new(INVALID_TXT_RECORD_OPTION) unless VALID_TXT_OPTIONS.include?(key.downcase)
+          key, value = opt.split('=')
+          unless VALID_TXT_OPTIONS.include?(key.downcase)
+            msg = "TXT records can only specify the options [#{VALID_TXT_OPTIONS.join(', ')}]: #{string}"
+            raise Error::InvalidTXTRecord.new(msg)
+          end
           options_mapper.add_uri_option(key, value, txt_options)
           txt_options
         end

data/lib/mongo/uri.rb

@@ -520,6 +520,44 @@ module Mongo
       elsif uri_options[:direct_connection] == false && uri_options[:connect].to_s == 'direct'
         raise_invalid_error_no_fmt!("directConnection=false cannot be used with connect=direct")
       end
+
+      if uri_options[:load_balanced]
+        if servers.length > 1
+          raise_invalid_error_no_fmt!("loadBalanced=true cannot be used with multiple seeds")
+        end
+
+        if uri_options[:direct_connection]
+          raise_invalid_error_no_fmt!("directConnection=true cannot be used with loadBalanced=true")
+        end
+
+        if uri_options[:connect] && uri_options[:connect].to_sym == :direct
+          raise_invalid_error_no_fmt!("connect=direct cannot be used with loadBalanced=true")
+        end
+
+        if uri_options[:replica_set]
+          raise_invalid_error_no_fmt!("loadBalanced=true cannot be used with replicaSet option")
+        end
+      end
+
+      unless self.is_a?(URI::SRVProtocol)
+        if uri_options[:srv_max_hosts]
+          raise_invalid_error_no_fmt!("srvMaxHosts cannot be used on non-SRV URI")
+        end
+
+        if uri_options[:srv_service_name]
+          raise_invalid_error_no_fmt!("srvServiceName cannot be used on non-SRV URI")
+        end
+      end
+
+      if uri_options[:srv_max_hosts] && uri_options[:srv_max_hosts] > 0
+        if uri_options[:replica_set]
+          raise_invalid_error_no_fmt!("srvMaxHosts > 0 cannot be used with replicaSet option")
+        end
+
+        if options[:load_balanced]
+          raise_invalid_error_no_fmt!("srvMaxHosts > 0 cannot be used with loadBalanced=true")
+        end
+      end
     end
   end
 end

data/lib/mongo/utils.rb

@@ -101,18 +101,5 @@ module Mongo
     module_function def monotonic_time
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
-
-    # Hash#compact implementation for Ruby 2.3
-    module_function def compact_hash(hash)
-      Hash[hash.reject do |k, v|
-        v.nil?
-      end]
-    end
-
-    # Hash#compact implementation for Ruby 2.3/2.4
-    # Implementation based on activesupport 5.2.3
-    module_function def slice_hash(hash, *keys)
-      keys.each_with_object({}) { |k, res| res[k] = hash[k] if hash.key?(k) }
-    end
   end
 end

data/lib/mongo/version.rb

@@ -20,5 +20,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.15.0'.freeze
+  VERSION = '2.18.1'.freeze
 end

data/lib/mongo.rb

@@ -75,8 +75,30 @@ require 'mongo/uri'
 require 'mongo/version'
 require 'mongo/write_concern'
 require 'mongo/utils'
+require 'mongo/config'
 
 module Mongo
+
+  class << self
+    extend Forwardable
+
+    # Delegate the given option along with its = and ? methods to the given
+    # object.
+    #
+    # @param [ Object ] obj The object to delegate to.
+    # @param [ Symbol ] opt The method to delegate.
+    def self.delegate_option(obj, opt)
+      def_delegators obj, opt, "#{opt}=", "#{opt}?"
+    end
+
+    # Take all the public instance methods from the Config singleton and allow
+    # them to be accessed through the Mongo module directly.
+    def_delegators Config, :options=
+    delegate_option Config, :broken_view_aggregate
+    delegate_option Config, :broken_view_options
+    delegate_option Config, :validate_update_replace
+  end
+
   # Clears the driver's OCSP response cache.
   module_function def clear_ocsp_cache
     Socket::OcspCache.clear

data/mongo.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
 
   s.authors           = ['Tyler Brock', 'Emily Stolfo', 'Durran Jordan']
-  s.homepage          = 'https://docs.mongodb.com/ruby-driver/'
+  s.homepage          = 'https://mongodb.com/docs/ruby-driver/'
   s.summary           = 'Ruby driver for MongoDB'
   s.description       = 'A Ruby driver for MongoDB'
   s.license           = 'Apache-2.0'
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.metadata = {
     'bug_tracker_uri' => 'https://jira.mongodb.org/projects/RUBY',
     'changelog_uri' => 'https://github.com/mongodb/mongo-ruby-driver/releases',
-    'documentation_uri' => 'https://docs.mongodb.com/ruby-driver/',
-    'homepage_uri' => 'https://docs.mongodb.com/ruby-driver/',
+    'documentation_uri' => 'https://mongodb.com/docs/ruby-driver/',
+    'homepage_uri' => 'https://mongodb.com/docs/ruby-driver/',
     'source_code_uri' => 'https://github.com/mongodb/mongo-ruby-driver',
   }
 
@@ -36,7 +36,13 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.bindir            = 'bin'
 
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency 'bson', '>=4.8.2', '<5.0.0'
+  # For testing driver against bson master we need to depend on bson < 6.0.0
+  # but in release version we want to depend on bson < 5.0.0.
+  if %w(1 yes true).include?(ENV['MONGO_RUBY_DRIVER_BSON_MASTER'])
+    s.add_dependency 'bson', '>=4.13.0', '<6.0.0'
+  else
+    s.add_dependency 'bson', '>=4.14.1', '<5.0.0'
+  end
 end

data/spec/README.md

@@ -408,7 +408,8 @@ The client-side encryption tests require the mongocryptd binary to be in the
 system path.
 
 Download enterprise versions of MongoDB here: https://www.mongodb.com/download-center/enterprise
-Read more about installing mongocryptd here: https://docs.mongodb.com/manual/reference/security-client-side-encryption-appendix/#mongocryptd
+Download the Automatic Encryption Shared Library https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/shared-library/#std-label-qe-reference-shared-library-download
+Install and Configure mongocryptd: https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/mongocryptd/
 
 Install libmongocrypt on your machine:
 
@@ -426,6 +427,9 @@ Option 1: Download a pre-built binary
 Option 2: Build from source
 - To build libmongocrypt from source, follow the instructions in the README on the libmongocrypt GitHub repo: https://github.com/mongodb/libmongocrypt
 
+Option 3: Use libmongocrypt-helper gem (Linux only)
+- Run command `FLE=helper bundle install`
+
 Create AWS KMS keys
 Many of the Client-Side Encryption tests require that you have an encryption
 master key hosted on AWS's Key Management Service. Set up a master key by following
@@ -513,9 +517,9 @@ To test compression, set the `compressors` URI option:
     MONGODB_URI="mongodb://localhost:27017/?compressors=zlib" rake
 
 Note that as of this writing, the driver supports
-[ztsd](https://docs.mongodb.com/manual/reference/glossary/#term-zstd),
-[snappy](https://docs.mongodb.com/manual/reference/glossary/#term-snappy)
-and [zlib](https://docs.mongodb.com/manual/reference/glossary/#term-zlib)
+[ztsd](https://mongodb.com/docs/manual/reference/glossary/#term-zstd),
+[snappy](https://mongodb.com/docs/manual/reference/glossary/#term-snappy)
+and [zlib](https://mongodb.com/docs/manual/reference/glossary/#term-zlib)
 compression.
 
 Servers 4.2+ enable zlib by default; to test older servers, explicitly enable
@@ -530,7 +534,7 @@ To specify server API parameters, use the `SERVER_API` environment variable.
 The server API parameters cannot be specified via URI options.
 
 Both YAML and JSON syntaxes are accepted:
-    
+
     SERVER_API='{version: "1", strict: true}' rake
 
     SERVER_API='{"version":"1","strict":true}' rake
@@ -713,3 +717,17 @@ To break into the debugger on JRuby, call:
 
     require 'ruby-debug'
     debugger
+
+## Testing against load balancer locally
+
+1. Install mongodb server v5.2+.
+2. Install haproxy.
+3. Install mongo-orchestration - https://github.com/10gen/mongo-orchestration/
+4. Install drivers-evergreen-tools - https://github.com/mongodb-labs/drivers-evergreen-tools. In ruby driver it is installed as git submodule under `.mod/drivers-evergreen-tools/`.
+5. Start mongo-orchestration: `mongo-orchestration start`.
+6. Start the cluster: `http PUT http://localhost:8889/v1/sharded_clusters/myCluster @.mod/drivers-evergreen-tools/.evergreen/orchestration/configs/sharded_clusters/basic-load-balancer.json` (this example uses httpie client, can be done with curl).
+7. Start load balancer: `MONGODB_URI="mongodb://localhost:27017,localhost:27018/" .mod/drivers-evergreen-tools/.evergreen/run-load-balancer.sh start`.
+8. Run tests: `TOPOLOGY=load-balanced MONGODB_URI='mongodb://127.0.0.1:8000/?loadBalanced=true' be rspec spec/`.
+9. Stop load balancer: `MONGODB_URI="mongodb://localhost:27017,localhost:27018/" .mod/drivers-evergreen-tools/.evergreen/run-load-balancer.sh stop`.
+10. Stop the cluster: `http DELETE http://localhost:8889/v1/sharded_clusters/myCluster`
+11. Stop mongo-orchestration: `mongo-orchestration stop`.

data/spec/integration/auth_spec.rb

@@ -14,7 +14,7 @@ describe 'Auth' do
     end
 
     let(:base_options) do
-      SpecConfig.instance.monitoring_options
+      SpecConfig.instance.monitoring_options.merge(connect: SpecConfig.instance.test_options[:connect])
     end
 
     let(:connection) do
@@ -276,4 +276,34 @@ describe 'Auth' do
       client.database.command(ping: 1)
     end
   end
+
+  context 'in lb topology' do
+    require_topology :load_balanced
+
+    context 'when authentication fails with network error' do
+      let(:server) do
+        authorized_client.cluster.next_primary
+      end
+
+      let(:base_options) do
+        SpecConfig.instance.monitoring_options.merge(connect: SpecConfig.instance.test_options[:connect])
+      end
+
+      let(:connection) do
+        Mongo::Server::Connection.new(server, base_options)
+      end
+
+      it 'includes service id in exception' do
+        expect_any_instance_of(Mongo::Server::PendingConnection).to receive(:authenticate!).and_raise(Mongo::Error::SocketError)
+
+        begin
+          connection.connect!
+        rescue Mongo::Error::SocketError => exc
+          exc.service_id.should_not be nil
+        else
+          fail 'Expected the SocketError to be raised'
+        end
+      end
+    end
+  end
 end

data/spec/integration/awaited_ismaster_spec.rb

@@ -9,7 +9,7 @@ describe 'awaited hello' do
   # If we send the consecutive hello commands to different mongoses,
   # they have different process ids, and so the awaited one would return
   # immediately.
-  require_no_multi_shard
+  require_no_multi_mongos
 
   let(:client) { authorized_client }
 

data/spec/integration/aws_lambda_examples_spec.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe "AWS Lambda examples in Ruby" do
+
+  it "shares the client" do
+    # Start AWS Lambda Example 1
+
+    # Require the driver library.
+    require "mongo"
+
+    # Create a Mongo::Client instance.
+    # CRITICAL: You must create the client instance outside the handler
+    # so that the client can be reused across function invocations.
+    client = Mongo::Client.new(ENV.fetch("MONGODB_URI"))
+
+    def lambda_handler(event:, context:)
+      # Use the client to return the name of the configured database.
+      client.database.name
+    end
+
+    # End AWS Lambda Example 1
+
+    client.close
+  end
+
+  context "when using AWS IAM authentication" do
+    require_auth 'aws-assume-role'
+
+    it "connects to the deployment" do
+      allow(ENV).to receive(:fetch).and_call_original
+      allow(ENV).to receive(:fetch).with("MONGODB_HOST").and_return(SpecConfig.instance.addresses.first)
+      allow(ENV).to receive(:fetch).with("AWS_ACCESS_KEY_ID").and_return(ENV.fetch("MONGO_RUBY_DRIVER_AWS_AUTH_ACCESS_KEY_ID"))
+      allow(ENV).to receive(:fetch).with("AWS_SECRET_ACCESS_KEY").and_return(ENV.fetch("MONGO_RUBY_DRIVER_AWS_AUTH_SECRET_ACCESS_KEY"))
+      allow(ENV).to receive(:fetch).with("AWS_SESSION_TOKEN").and_return(ENV.fetch("MONGO_RUBY_DRIVER_AWS_AUTH_SESSION_TOKEN"))
+      allow(ENV).to receive(:fetch).with("MONGODB_DATABASE").and_return("test")
+
+      # Start AWS Lambda Example 2
+
+      # Require the driver library.
+      require "mongo"
+
+      # Create a Mongo::Client instance using AWS IAM authentication.
+      # CRITICAL: You must create the client instance outside the handler
+      # so that the client can be reused across function invocations.
+      client = Mongo::Client.new([ENV.fetch("MONGODB_HOST")],
+                                 auth_mech: :aws,
+                                 user: ENV.fetch("AWS_ACCESS_KEY_ID"),
+                                 password: ENV.fetch("AWS_SECRET_ACCESS_KEY"),
+                                 auth_mech_properties: {
+                                   aws_session_token: ENV.fetch("AWS_SESSION_TOKEN"),
+                                 },
+                                 database: ENV.fetch("MONGODB_DATABASE"))
+
+      def lambda_handler(event:, context:)
+        # Use the client to return the name of the configured database.
+        client.database.name
+      end
+
+      # End AWS Lambda Example 2
+
+      client.close
+    end
+  end
+
+end

data/spec/integration/bulk_write_error_message_spec.rb

@@ -38,4 +38,36 @@ describe 'BulkWriteError message' do
       end
     end
   end
+
+  context 'a bulk write with validation errors' do
+
+    let(:collection_name) { 'bulk_write_error_validation_message_spec' }
+
+    let(:collection) do
+      client[:collection_name].drop
+      client[:collection_name,
+      {
+        'validator' => {
+          'x' => { '$type' => 'string' },
+        }
+      }].create
+      client[:collection_name]
+    end
+
+    it 'reports code name, code, message, and details' do
+      begin
+        collection.insert_one({_id:1, x:"1"})
+        collection.insert_many([
+          {_id: 1, x:"1"},
+          {_id: 2, x:1},
+        ], ordered: false)
+        fail('Should have raised')
+      rescue Mongo::Error::BulkWriteError => e
+        e.message.should =~ %r,\AMultiple errors: \[11000\]: (insertDocument :: caused by :: 11000 )?E11000 duplicate key error (collection|index):.*\; \[121\]: Document failed validation( -- .*)?,
+        # The duplicate key error should not print details because it's not a
+        # WriteError or a WriteConcernError
+        e.message.scan(/ -- /).length.should be <= 1
+      end
+    end
+  end
 end

data/spec/integration/bulk_write_spec.rb

@@ -18,10 +18,26 @@ describe 'Bulk writes' do
         authorized_collection.bulk_write(operations)
       end.not_to raise_error
     end
+
+    context 'in transaction' do
+      require_transaction_support
+      min_server_version "4.4"
+
+      it 'succeeds' do
+        authorized_collection.create
+        expect do
+          authorized_collection.client.start_session do |session|
+            session.with_transaction do
+              authorized_collection.bulk_write(operations, { session: session })
+            end
+          end
+        end.not_to raise_error
+      end
+    end
   end
 
   context 'when bulk write needs to be split' do
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:max_bson_size) { Mongo::Server::ConnectionBase::DEFAULT_MAX_BSON_OBJECT_SIZE }
 

data/spec/integration/change_stream_spec.rb

@@ -3,7 +3,8 @@
 
 require 'spec_helper'
 
-describe 'Change stream integration', retry: 4 do
+describe 'Change stream integration' do
+  retry_test tries: 4
   require_mri
   max_example_run_time 7
   min_server_fcv '3.6'
@@ -53,7 +54,7 @@ describe 'Change stream integration', retry: 4 do
       it 'raises an exception and does not attempt to resume' do
         change_stream
 
-        subscriber = EventSubscriber.new
+        subscriber = Mrss::EventSubscriber.new
         authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
 
         expect do
@@ -101,7 +102,7 @@ describe 'Change stream integration', retry: 4 do
       it 'watch raises error' do
         expect do
           client['change-stream'].watch
-        end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command due to 'failCommand' failpoint/)
+        end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command (due to|via) 'failCommand' failpoint/)
       end
     end
 
@@ -286,7 +287,7 @@ describe 'Change stream integration', retry: 4 do
 
         expect do
           enum.next
-        end.to raise_error(Mongo::Error::OperationFailure, /101\b.*Failing command due to 'failCommand' failpoint/)
+        end.to raise_error(Mongo::Error::OperationFailure, /101\b.*Failing command (due to|via) 'failCommand' failpoint/)
       end
     end
   end
@@ -417,7 +418,7 @@ describe 'Change stream integration', retry: 4 do
 
           expect do
             enum.try_next
-          end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command due to 'failCommand' failpoint/)
+          end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command (due to|via) 'failCommand' failpoint/)
         end
       end
 
@@ -444,7 +445,7 @@ describe 'Change stream integration', retry: 4 do
 
           expect do
             enum.try_next
-          end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command due to 'failCommand' failpoint/)
+          end.to raise_error(Mongo::Error::OperationFailure, /10107\b.*Failing command (due to|via) 'failCommand' failpoint/)
         end
       end
     end
@@ -523,7 +524,7 @@ describe 'Change stream integration', retry: 4 do
     let(:events) do
       start_after
 
-      subscriber = EventSubscriber.new
+      subscriber = Mrss::EventSubscriber.new
       authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
       use_stream
 
@@ -582,7 +583,7 @@ describe 'Change stream integration', retry: 4 do
     let(:stream) { authorized_collection.watch }
 
     let(:events) do
-      subscriber = EventSubscriber.new
+      subscriber = Mrss::EventSubscriber.new
       authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
       use_stream
       subscriber.succeeded_events.select { |e|