RUBY-2484 Updated command event handling for DAT

spec/runners/unified/event_subscriber.rb

@@ -31,43 +31,44 @@ def add_wanted_events(kind)
 
   class StoringEventSubscriber
     def initialize(&block)
-      @operations = {}
       @handler = block
     end
 
     def started(event)
-      started_at = Time.now
-      @operations[event.operation_id] = [event, started_at]
       @handler.call(
         'name' => event.class.name.sub(/.*::/, '') + 'Event',
         'commandName' => event.command_name,
-        'startTime' => started_at.to_f,
+        'databaseName' => event.database_name,
+        'observedAt' => Time.now.to_f,
         'address' => event.address.seed,
+        'requestId' => event.request_id,
+        'operationId' => event.operation_id,
+        'connectionId' => event.connection_id,
       )
     end
 
     def succeeded(event)
-      started_event, started_at = @operations.delete(event.operation_id)
-      raise "Started event for #{event.operation_id} not found" unless started_event
       @handler.call(
         'name' => event.class.name.sub(/.*::/, '') + 'Event',
-        'commandName' => started_event.command_name,
+        'commandName' => event.command_name,
         'duration' => event.duration,
-        'startTime' => started_at.to_f,
-        'address' => started_event.address.seed,
+        'observedAt' => Time.now.to_f,
+        'address' => event.address.seed,
+        'requestId' => event.request_id,
+        'operationId' => event.operation_id,
       )
     end
 
     def failed(event)
-      started_event, started_at = @operations.delete(event.operation_id)
-      raise "Started event for #{event.operation_id} not found" unless started_event
       @handler.call(
         'name' => event.class.name.sub(/.*::/, '') + 'Event',
-        'commandName' => started_event.command_name,
+        'commandName' => event.command_name,
         'duration' => event.duration,
         'failure' => event.failure,
-        'startTime' => started_at.to_f,
-        'address' => started_event.address.seed,
+        'observedAt' => Time.now.to_f,
+        'address' => event.address.seed,
+        'requestId' => event.request_id,
+        'operationId' => event.operation_id,
       )
     end
 

spec/runners/unified/test.rb

@@ -105,6 +105,7 @@ def create_entities
               end
             end
             opts[:sdam_proc] = lambda do |client|
+              client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
               client.subscribe(Mongo::Monitoring::CONNECTION_POOL, subscriber)
             end
           end