RUBY-3743 Finish implementing spec changes from DRIVERS-1519

lib/mongo/client.rb

@@ -356,7 +356,9 @@ def hash
     #   that the driver will communicate with for sharded topologies. If this
     #   option is 0, then there will be no maximum number of mongoses. If the
     #   given URI resolves to more hosts than ``:srv_max_hosts``, the client
-    #   will ramdomly choose an ``:srv_max_hosts`` sized subset of hosts.
+    #   will randomly choose an ``:srv_max_hosts`` sized subset of hosts. If
+    #   srvMaxHosts is provided in the URI options, it takes precedence over this
+    #   option.
     # @option options [ String ] :srv_service_name The service name to use in
     #   the SRV DNS query.
     # @option options [ true, false ] :ssl Whether to use TLS.

lib/mongo/srv/monitor.rb

@@ -72,7 +72,11 @@ def do_work
       def scan!
         begin
           last_result = Timeout.timeout(timeout) do
-            @resolver.get_records(@srv_uri.query_hostname)
+            @resolver.get_records(
+              @srv_uri.query_hostname, 
+              @srv_uri.uri_options[:srv_service_name] || options[:srv_service_name],
+              @srv_uri.uri_options[:srv_max_hosts] || @options[:srv_max_hosts]
+            )
           end
         rescue Resolv::ResolvTimeout => e
           log_warn("SRV monitor: timed out trying to resolve hostname #{@srv_uri.query_hostname}: #{e.class}: #{e}")

lib/mongo/uri/srv_protocol.rb

@@ -122,11 +122,13 @@ def raise_invalid_error!(details)
       end
 
       # Gets the SRV resolver.
+      # If domain verification fails or no SRV records are found,
+      # an error must not be raised per the spec; instead, a warning is logged.
       #
       # @return [ Mongo::Srv::Resolver ]
       def resolver
         @resolver ||= Srv::Resolver.new(
-          raise_on_invalid: true,
+          raise_on_invalid: false,
           resolv_options: options[:resolv_options],
           timeout: options[:connect_timeout],
         )
@@ -149,7 +151,11 @@ def parse!(remaining)
 
         log_debug "attempting to resolve #{hostname}"
 
-        @srv_result = resolver.get_records(hostname, uri_options[:srv_service_name], uri_options[:srv_max_hosts])
+        @srv_result = resolver.get_records(
+          hostname,
+          uri_options[:srv_service_name] || options[:srv_service_name],
+          uri_options[:srv_max_hosts] || options[:srv_max_hosts]
+        )
         if srv_result.empty?
           raise Error::NoSRVRecords.new(NO_SRV_RECORDS % hostname)
         end