mongo 2.22.0 → 2.24.0

data/lib/mongo/monitoring/event/server_heartbeat_succeeded.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -18,12 +17,10 @@
 module Mongo
   class Monitoring
     module Event
-
       # Event fired when a server heartbeat is dispatched.
       #
       # @since 2.7.0
       class ServerHeartbeatSucceeded < Mongo::Event::Base
-
         # Create the event.
         #
         # @example Create the event.
@@ -37,9 +34,7 @@ module Mongo
         #
         # @since 2.7.0
         # @api private
-        def initialize(address, round_trip_time, awaited: false,
-          started_event:
-        )
+        def initialize(address, round_trip_time, started_event:, awaited: false)
           @address = address
           @round_trip_time = round_trip_time
           @awaited = !!awaited
@@ -53,7 +48,7 @@ module Mongo
         attr_reader :round_trip_time
 
         # Alias of round_trip_time.
-        alias :duration :round_trip_time
+        alias duration round_trip_time
 
         # @return [ true | false ] Whether the heartbeat was awaited.
         def awaited?
@@ -76,7 +71,7 @@ module Mongo
         # @api experimental
         def summary
           "#<#{short_class_name}" +
-          " address=#{address}>"
+            " address=#{address}>"
         end
       end
     end

data/lib/mongo/monitoring/event/server_opening.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -18,12 +17,10 @@
 module Mongo
   class Monitoring
     module Event
-
       # Event fired when the server is opening.
       #
       # @since 2.4.0
       class ServerOpening < Mongo::Event::Base
-
         # @return [ Address ] address The server address.
         attr_reader :address
 
@@ -54,7 +51,7 @@ module Mongo
         # @api experimental
         def summary
           "#<#{short_class_name}" +
-          " address=#{address} topology=#{topology.summary}>"
+            " address=#{address} topology=#{topology.summary}>"
         end
       end
     end

data/lib/mongo/monitoring/event/topology_changed.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -18,12 +17,10 @@
 module Mongo
   class Monitoring
     module Event
-
       # Event fired when the topology changes.
       #
       # @since 2.4.0
       class TopologyChanged < Mongo::Event::Base
-
         # @return [ Cluster::Topology ] previous_topology The previous topology.
         attr_reader :previous_topology
 
@@ -54,8 +51,8 @@ module Mongo
         # @api experimental
         def summary
           "#<#{short_class_name}" +
-          " prev=#{previous_topology.summary}" +
-          " new=#{new_topology.summary}>"
+            " prev=#{previous_topology.summary}" +
+            " new=#{new_topology.summary}>"
         end
       end
     end

data/lib/mongo/monitoring/event/topology_closed.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -18,12 +17,10 @@
 module Mongo
   class Monitoring
     module Event
-
       # Event fired when the topology closes.
       #
       # @since 2.4.0
       class TopologyClosed < Mongo::Event::Base
-
         # @return [ Topology ] topology The topology.
         attr_reader :topology
 
@@ -49,7 +46,7 @@ module Mongo
         # @api experimental
         def summary
           "#<#{short_class_name}" +
-          " topology=#{topology.summary}>"
+            " topology=#{topology.summary}>"
         end
       end
     end

data/lib/mongo/monitoring/event/topology_opening.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -18,12 +17,10 @@
 module Mongo
   class Monitoring
     module Event
-
       # Event fired when the topology is opening.
       #
       # @since 2.4.0
       class TopologyOpening < Mongo::Event::Base
-
         # @return [ Topology ] topology The topology.
         attr_reader :topology
 
@@ -49,7 +46,7 @@ module Mongo
         # @api experimental
         def summary
           "#<#{short_class_name}" +
-          " topology=#{topology.summary}>"
+            " topology=#{topology.summary}>"
         end
       end
     end

data/lib/mongo/monitoring/event.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #

data/lib/mongo/monitoring/publishable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Monitoring
-
     # Defines behavior for an object that can publish monitoring events.
     #
     # @since 2.1.0
@@ -47,15 +45,13 @@ module Mongo
       private
 
       def command_started(address, operation_id, payload,
-        socket_object_id: nil, connection_id: nil, connection_generation: nil,
-        server_connection_id: nil, service_id: nil
-      )
+                          socket_object_id: nil, connection_id: nil, connection_generation: nil,
+                          server_connection_id: nil, service_id: nil)
         event = Event::CommandStarted.generate(address, operation_id, payload,
-            socket_object_id: socket_object_id, connection_id: connection_id,
-            connection_generation: connection_generation,
-            server_connection_id: server_connection_id,
-            service_id: service_id,
-          )
+                                               socket_object_id: socket_object_id, connection_id: connection_id,
+                                               connection_generation: connection_generation,
+                                               server_connection_id: server_connection_id,
+                                               service_id: service_id)
         monitoring.started(
           Monitoring::COMMAND,
           event
@@ -64,27 +60,23 @@ module Mongo
       end
 
       def command_completed(result, address, operation_id, payload, duration,
-        started_event:, server_connection_id: nil, service_id: nil
-      )
+                            started_event:, server_connection_id: nil, service_id: nil)
         document = result ? (result.documents || []).first : nil
-        if document && (document['ok'] && document['ok'] != 1 || document.key?('$err'))
+        if document && ((document['ok'] && document['ok'] != 1) || document.key?('$err'))
           parser = Error::Parser.new(document)
           command_failed(document, address, operation_id,
-            payload, parser.message, duration,
-            started_event: started_event, server_connection_id: server_connection_id,
-            service_id: service_id,
-          )
+                         payload, parser.message, duration,
+                         started_event: started_event, server_connection_id: server_connection_id,
+                         service_id: service_id)
         else
           command_succeeded(result, address, operation_id, payload, duration,
-            started_event: started_event, server_connection_id: server_connection_id,
-            service_id: service_id,
-          )
+                            started_event: started_event, server_connection_id: server_connection_id,
+                            service_id: service_id)
         end
       end
 
       def command_succeeded(result, address, operation_id, payload, duration,
-        started_event:, server_connection_id: nil, service_id: nil
-      )
+                            started_event:, server_connection_id: nil, service_id: nil)
         monitoring.succeeded(
           Monitoring::COMMAND,
           Event::CommandSucceeded.generate(
@@ -95,22 +87,20 @@ module Mongo
             duration,
             started_event: started_event,
             server_connection_id: server_connection_id,
-            service_id: service_id,
+            service_id: service_id
           )
         )
       end
 
       def command_failed(failure, address, operation_id, payload, message, duration,
-        started_event:, server_connection_id: nil, service_id: nil
-      )
+                         started_event:, server_connection_id: nil, service_id: nil)
         monitoring.failed(
           Monitoring::COMMAND,
           Event::CommandFailed.generate(address, operation_id, payload,
-            message, failure, duration,
-            started_event: started_event,
-            server_connection_id: server_connection_id,
-            service_id: service_id,
-          )
+                                        message, failure, duration,
+                                        started_event: started_event,
+                                        server_connection_id: server_connection_id,
+                                        service_id: service_id)
         )
       end
 

data/lib/mongo/monitoring/sdam_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to SDAM events and logs them.
     #
     # @since 2.4.0

data/lib/mongo/monitoring/server_closed_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Server Closed events and logs them.
     #
     # @since 2.4.0
     class ServerClosedLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)

data/lib/mongo/monitoring/server_description_changed_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Server Description Changed events and logs them.
     #
     # @since 2.4.0
     class ServerDescriptionChangedLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)

data/lib/mongo/monitoring/server_opening_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Server Opening events and logs them.
     #
     # @since 2.4.0
     class ServerOpeningLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)

data/lib/mongo/monitoring/topology_changed_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,24 +16,22 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Topology Changed events and logs them.
     #
     # @since 2.4.0
     class TopologyChangedLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)
-        if event.previous_topology.class != event.new_topology.class
+        if event.previous_topology.class == event.new_topology.class
           log_debug(
-            "Topology type '#{event.previous_topology.display_name}' changed to " +
-            "type '#{event.new_topology.display_name}'."
+            "There was a change in the members of the '#{event.new_topology.display_name}' " +
+              'topology.'
           )
         else
           log_debug(
-            "There was a change in the members of the '#{event.new_topology.display_name}' " +
-              "topology."
+            "Topology type '#{event.previous_topology.display_name}' changed to " +
+            "type '#{event.new_topology.display_name}'."
           )
         end
       end

data/lib/mongo/monitoring/topology_closed_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Topology Closed events and logs them.
     #
     # @since 2.7.0
     class TopologyClosedLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)

data/lib/mongo/monitoring/topology_opening_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2016-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to Topology Opening events and logs them.
     #
     # @since 2.4.0
     class TopologyOpeningLogSubscriber < SDAMLogSubscriber
-
       private
 
       def log_event(event)

data/lib/mongo/monitoring/unified_sdam_log_subscriber.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Monitoring
-
     # Subscribes to SDAM events and logs them.
     #
     # @since 2.11.0
@@ -50,7 +48,7 @@ module Mongo
         log_debug("EVENT: #{event.summary}") if logger.debug?
       end
 
-      alias :succeeded :published
+      alias succeeded published
 
       def subscribe(client)
         client.subscribe(Mongo::Monitoring::TOPOLOGY_OPENING, self)

data/lib/mongo/monitoring.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #
@@ -16,7 +15,6 @@
 # limitations under the License.
 
 module Mongo
-
   # The class defines behavior for the performance monitoring API.
   #
   # @since 2.1.0
@@ -26,47 +24,47 @@ module Mongo
     # The command topic.
     #
     # @since 2.1.0
-    COMMAND = 'Command'.freeze
+    COMMAND = 'Command'
 
     # The connection pool topic.
     #
     # @since 2.9.0
-    CONNECTION_POOL = 'ConnectionPool'.freeze
+    CONNECTION_POOL = 'ConnectionPool'
 
     # Server closed topic.
     #
     # @since 2.4.0
-    SERVER_CLOSED = 'ServerClosed'.freeze
+    SERVER_CLOSED = 'ServerClosed'
 
     # Server description changed topic.
     #
     # @since 2.4.0
-    SERVER_DESCRIPTION_CHANGED = 'ServerDescriptionChanged'.freeze
+    SERVER_DESCRIPTION_CHANGED = 'ServerDescriptionChanged'
 
     # Server opening topic.
     #
     # @since 2.4.0
-    SERVER_OPENING = 'ServerOpening'.freeze
+    SERVER_OPENING = 'ServerOpening'
 
     # Topology changed topic.
     #
     # @since 2.4.0
-    TOPOLOGY_CHANGED = 'TopologyChanged'.freeze
+    TOPOLOGY_CHANGED = 'TopologyChanged'
 
     # Topology closed topic.
     #
     # @since 2.4.0
-    TOPOLOGY_CLOSED = 'TopologyClosed'.freeze
+    TOPOLOGY_CLOSED = 'TopologyClosed'
 
     # Topology opening topic.
     #
     # @since 2.4.0
-    TOPOLOGY_OPENING = 'TopologyOpening'.freeze
+    TOPOLOGY_OPENING = 'TopologyOpening'
 
     # Server heartbeat started topic.
     #
     # @since 2.7.0
-    SERVER_HEARTBEAT = 'ServerHeartbeat'.freeze
+    SERVER_HEARTBEAT = 'ServerHeartbeat'
 
     # Used for generating unique operation ids to link events together.
     #
@@ -77,7 +75,7 @@ module Mongo
     #
     # @since 2.1.0
     def self.next_operation_id
-      self.next_id
+      next_id
     end
 
     # Contains subscription methods common between monitoring and
@@ -138,9 +136,9 @@ module Mongo
       def unsubscribe(topic, subscriber)
         subs = subscribers_for(topic)
         index = subs.index(subscriber)
-        if index
-          subs.delete_at(index)
-        end
+        return unless index
+
+        subs.delete_at(index)
       end
 
       # Get all the subscribers.
@@ -219,23 +217,23 @@ module Mongo
     # @api private
     def initialize(options = {})
       @options = options
-      if options[:monitoring] != false
-        Global.subscribers.each do |topic, subscribers|
-          subscribers.each do |subscriber|
-            subscribe(topic, subscriber)
-          end
+      return unless options[:monitoring] != false
+
+      Global.subscribers.each do |topic, subscribers|
+        subscribers.each do |subscriber|
+          subscribe(topic, subscriber)
         end
-        subscribe(COMMAND, CommandLogSubscriber.new(options))
-        # CMAP events are not logged by default because this will create
-        # log entries for every operation performed by the driver.
-        #subscribe(CONNECTION_POOL, CmapLogSubscriber.new(options))
-        subscribe(SERVER_OPENING, ServerOpeningLogSubscriber.new(options))
-        subscribe(SERVER_CLOSED, ServerClosedLogSubscriber.new(options))
-        subscribe(SERVER_DESCRIPTION_CHANGED, ServerDescriptionChangedLogSubscriber.new(options))
-        subscribe(TOPOLOGY_OPENING, TopologyOpeningLogSubscriber.new(options))
-        subscribe(TOPOLOGY_CHANGED, TopologyChangedLogSubscriber.new(options))
-        subscribe(TOPOLOGY_CLOSED, TopologyClosedLogSubscriber.new(options))
       end
+      subscribe(COMMAND, CommandLogSubscriber.new(options))
+      # CMAP events are not logged by default because this will create
+      # log entries for every operation performed by the driver.
+      # subscribe(CONNECTION_POOL, CmapLogSubscriber.new(options))
+      subscribe(SERVER_OPENING, ServerOpeningLogSubscriber.new(options))
+      subscribe(SERVER_CLOSED, ServerClosedLogSubscriber.new(options))
+      subscribe(SERVER_DESCRIPTION_CHANGED, ServerDescriptionChangedLogSubscriber.new(options))
+      subscribe(TOPOLOGY_OPENING, TopologyOpeningLogSubscriber.new(options))
+      subscribe(TOPOLOGY_CHANGED, TopologyChangedLogSubscriber.new(options))
+      subscribe(TOPOLOGY_CLOSED, TopologyClosedLogSubscriber.new(options))
     end
 
     # @api private
@@ -256,7 +254,7 @@ module Mongo
     #
     # @since 2.9.0
     def published(topic, event)
-      subscribers_for(topic).each{ |subscriber| subscriber.published(event) }
+      subscribers_for(topic).each { |subscriber| subscriber.published(event) }
     end
 
     # Publish a started event.
@@ -272,7 +270,7 @@ module Mongo
     #
     # @since 2.1.0
     def started(topic, event)
-      subscribers_for(topic).each{ |subscriber| subscriber.started(event) }
+      subscribers_for(topic).each { |subscriber| subscriber.started(event) }
     end
 
     # Publish a succeeded event.
@@ -288,7 +286,7 @@ module Mongo
     #
     # @since 2.1.0
     def succeeded(topic, event)
-      subscribers_for(topic).each{ |subscriber| subscriber.succeeded(event) }
+      subscribers_for(topic).each { |subscriber| subscriber.succeeded(event) }
     end
 
     # Publish a failed event.
@@ -304,14 +302,15 @@ module Mongo
     #
     # @since 2.1.0
     def failed(topic, event)
-      subscribers_for(topic).each{ |subscriber| subscriber.failed(event) }
+      subscribers_for(topic).each { |subscriber| subscriber.failed(event) }
     end
 
     # @api private
     def publish_heartbeat(server, awaited: false)
       if monitoring?
         started_event = Event::ServerHeartbeatStarted.new(
-          server.address, awaited: awaited)
+          server.address, awaited: awaited
+        )
         started(SERVER_HEARTBEAT, started_event)
       end
 
@@ -328,14 +327,14 @@ module Mongo
 
       begin
         result = yield
-      rescue => exc
+      rescue StandardError => e
         if monitoring?
           event = Event::ServerHeartbeatFailed.new(
             server.address,
             Utils.monotonic_time - start_time,
-            exc,
+            e,
             awaited: awaited,
-            started_event: started_event,
+            started_event: started_event
           )
           failed(SERVER_HEARTBEAT, event)
         end
@@ -346,7 +345,7 @@ module Mongo
             server.address,
             Utils.monotonic_time - start_time,
             awaited: awaited,
-            started_event: started_event,
+            started_event: started_event
           )
           succeeded(SERVER_HEARTBEAT, event)
         end

data/lib/mongo/operation/aggregate/op_msg.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 module Mongo
   module Operation
     class Aggregate
-
       # A MongoDB aggregate operation sent as an op message.
       #
       # @api private