PYTHON-979 - Update currentOp helper for command monitoring

Author: behackett

pymongo/database.py

@@ -592,15 +592,15 @@ def current_op(self, include_all=False):
  - `include_all` (optional): if ``True`` also list currently
  idle operations in the result
  """
+ cmd = SON([("currentOp", 1), ("$all", include_all)])
  with self.__client._socket_for_writes() as sock_info:
  if sock_info.max_wire_version >= 4:
- return sock_info.command(
- "admin", SON([("currentOp", 1), ("$all", include_all)]))
+ return sock_info.command("admin", cmd)
  else:
  spec = {"$all": True} if include_all else {}
  x = helpers._first_batch(sock_info, "admin.$cmd.sys.inprog",
  spec, -1, True, self.codec_options,
- ReadPreference.PRIMARY)
+ ReadPreference.PRIMARY, cmd, self.client._event_listeners)
  return x.get('data', [None])[0]
 
  def profiling_level(self):

test/test_monitoring.py

@@ -1230,6 +1230,24 @@ def test_first_batch_helper(self):
  self.assertEqual(started.request_id, succeeded.request_id)
  self.assertEqual(started.connection_id, succeeded.connection_id)
 
+ self.listener.results.clear()
+ self.client.pymongo_test.current_op(True)
+ started = results['started'][0]
+ succeeded = results['succeeded'][0]
+ self.assertEqual(0, len(results['failed']))
+ self.assertIsInstance(started, monitoring.CommandStartedEvent)
+ expected = SON([('currentOp', 1), ('$all', True)])
+ self.assertEqual(expected, started.command)
+ self.assertEqual('admin', started.database_name)
+ self.assertEqual('currentOp', started.command_name)
+ self.assertIsInstance(started.request_id, int)
+ self.assertEqual(self.client.address, started.connection_id)
+ self.assertIsInstance(succeeded, monitoring.CommandSucceededEvent)
+ self.assertIsInstance(succeeded.duration_micros, int)
+ self.assertEqual(started.command_name, succeeded.command_name)
+ self.assertEqual(started.request_id, succeeded.request_id)
+ self.assertEqual(started.connection_id, succeeded.connection_id)
+
  def test_sensitive_commands(self):
  listeners = self.client._event_listeners