Update Phabricator to new PhutilServiceProfiler APIs

Summary:
Get rid of the Phabricator-level DarkConsole-specific API and use the more
general Phutil-level one.

Test Plan:
Loaded DarkConsole services plugin, viewed Diffusion, got execs in the trace.

Reviewed By: aran
Reviewers: aran, jungejason, tuomaspelkonen
CC: aran
Differential Revision: 293

Author: epriestley

scripts/repository/parse_one_commit.php

@@ -76,8 +76,6 @@
   $workers[] = new PhabricatorRepositoryCommitHeraldWorker($spec);
 }
 
-ExecFuture::pushEchoMode(true);
-
 foreach ($workers as $worker) {
   echo "Running ".get_class($worker)."...\n";
   $worker->doWork();

src/__phutil_library_map__.php

@@ -109,7 +109,6 @@
     'DarkConsolePlugin' => 'aphront/console/plugin/base',
     'DarkConsoleRequestPlugin' => 'aphront/console/plugin/request',
     'DarkConsoleServicesPlugin' => 'aphront/console/plugin/services',
-    'DarkConsoleServicesPluginAPI' => 'aphront/console/plugin/services/api',
     'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof',
     'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api',
     'DatabaseConfigurationProvider' => 'applications/base/storage/configuration',

src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php

@@ -29,7 +29,7 @@ public function getDescription() {
   }
 
   public function generateData() {
-    return DarkConsoleServicesPluginAPI::getEvents();
+    return PhutilServiceProfiler::getInstance()->getServiceCallLog();
   }
 
   public function render() {
@@ -38,24 +38,31 @@ public function render() {
     $rows = array();
     foreach ($data as $row) {
 
-      switch ($row['event']) {
-        case DarkConsoleServicesPluginAPI::EVENT_QUERY:
+      switch ($row['type']) {
+        case 'query':
           $info = $row['query'];
           $info = phutil_escape_html($info);
           break;
-        case DarkConsoleServicesPluginAPI::EVENT_CONNECT:
+        case 'connect':
           $info = $row['host'].':'.$row['database'];
           $info = phutil_escape_html($info);
-
+          break;
+        case 'exec':
+          $info = $row['command'];
+          $info = phutil_escape_html($info);
+          break;
+        case 'conduit':
+          $info = $row['method'];
+          $info = phutil_escape_html($info);
           break;
         default:
           $info = '-';
           break;
       }
 
       $rows[] = array(
-        $row['event'],
-        number_format(1000000 * ($row['end'] - $row['start'])).' us',
+        phutil_escape_html($row['type']),
+        number_format(1000000 * $row['duration']).' us',
         $info,
       );
     }

src/aphront/console/plugin/services/__init__.php

@@ -7,10 +7,10 @@
 
 
 phutil_require_module('phabricator', 'aphront/console/plugin/base');
-phutil_require_module('phabricator', 'aphront/console/plugin/services/api');
 phutil_require_module('phabricator', 'view/control/table');
 
 phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'serviceprofiler');
 
 
 phutil_require_source('DarkConsoleServicesPlugin.php');

src/aphront/console/plugin/services/api/DarkConsoleServicesPluginAPI.php

@@ -21,9 +21,8 @@ abstract class PhabricatorDaemon extends PhutilDaemon {
   protected function willRun() {
     parent::willRun();
 
-    // Both of these store unbounded amounts of log data; make them discard it
-    // instead so that daemons do not require unbounded amounts of memory.
-    DarkConsoleServicesPluginAPI::enableDiscardMode();
+    // This stores unbounded amounts of log data; make it discard instead so
+    // that daemons do not require unbounded amounts of memory.
     DarkConsoleErrorLogPluginAPI::enableDiscardMode();
 
     $phabricator = phutil_get_library_root('phabricator');

src/aphront/console/plugin/services/api/__init__.php

@@ -7,7 +7,6 @@
 
 
 phutil_require_module('phabricator', 'aphront/console/plugin/errorlog/api');
-phutil_require_module('phabricator', 'aphront/console/plugin/services/api');
 
 phutil_require_module('phutil', 'daemon/base');
 phutil_require_module('phutil', 'moduleutils');

src/infrastructure/daemon/base/PhabricatorDaemon.php

@@ -129,39 +129,43 @@ private function establishConnection() {
         "available!");
     }
 
-    $conn = @mysql_connect(
-      $host,
-      $user,
-      $this->getConfiguration('pass'),
-      $new_link = true,
-      $flags = 0);
-
-    if (!$conn) {
-      $errno = mysql_errno();
-      $error = mysql_error();
-      throw new AphrontQueryConnectionException(
-        "Attempt to connect to {$user}@{$host} failed with error #{$errno}: ".
-        "{$error}.");
-    }
-
-    if ($database !== null) {
-      $ret = @mysql_select_db($database, $conn);
-      if (!$ret) {
-        $this->throwQueryException($conn);
-      }
-    }
-
-    $end = microtime(true);
-
-    DarkConsoleServicesPluginAPI::addEvent(
+    $profiler = PhutilServiceProfiler::getInstance();
+    $call_id = $profiler->beginServiceCall(
       array(
-        'event'     => DarkConsoleServicesPluginAPI::EVENT_CONNECT,
+        'type'      => 'connect',
         'host'      => $host,
         'database'  => $database,
-        'start'     => $start,
-        'end'       => $end,
       ));
 
+    try {
+      $conn = @mysql_connect(
+        $host,
+        $user,
+        $this->getConfiguration('pass'),
+        $new_link = true,
+        $flags = 0);
+
+      if (!$conn) {
+        $errno = mysql_errno();
+        $error = mysql_error();
+        throw new AphrontQueryConnectionException(
+          "Attempt to connect to {$user}@{$host} failed with error #{$errno}: ".
+          "{$error}.");
+      }
+
+      if ($database !== null) {
+        $ret = @mysql_select_db($database, $conn);
+        if (!$ret) {
+          $this->throwQueryException($conn);
+        }
+      }
+
+      $profiler->endServiceCall($call_id, array());
+    } catch (Exception $ex) {
+      $profiler->endServiceCall($call_id, array());
+      throw $ex;
+    }
+
     self::$connectionCache[$key] = $conn;
     $this->connection = $conn;
   }
@@ -205,17 +209,18 @@ public function executeRawQuery($raw_query) {
         $this->requireConnection();
 
         $start = microtime(true);
-        $result = @mysql_query($raw_query, $this->connection);
-        $end = microtime(true);
 
-        DarkConsoleServicesPluginAPI::addEvent(
+        $profiler = PhutilServiceProfiler::getInstance();
+        $call_id = $profiler->beginServiceCall(
           array(
-            'event' => DarkConsoleServicesPluginAPI::EVENT_QUERY,
+            'type'  => 'query',
             'query' => $raw_query,
-            'start' => $start,
-            'end'   => $end,
           ));
 
+        $result = @mysql_query($raw_query, $this->connection);
+
+        $profiler->endServiceCall($call_id, array());
+
         if ($result) {
           $this->lastResult = $result;
           break;

src/infrastructure/daemon/base/__init__.php

@@ -6,7 +6,6 @@
 
 
 
-phutil_require_module('phabricator', 'aphront/console/plugin/services/api');
 phutil_require_module('phabricator', 'storage/connection/base');
 phutil_require_module('phabricator', 'storage/exception/accessdenied');
 phutil_require_module('phabricator', 'storage/exception/base');
@@ -15,6 +14,7 @@
 phutil_require_module('phabricator', 'storage/exception/duplicatekey');
 phutil_require_module('phabricator', 'storage/exception/recoverable');
 
+phutil_require_module('phutil', 'serviceprofiler');
 phutil_require_module('phutil', 'utils');