zuul patch

diff --git a/zuul/merger/server.py b/zuul/merger/server.py
index b1921d97..a33a244a 100644
--- a/zuul/merger/server.py
+++ b/zuul/merger/server.py
@@ -12,15 +12,19 @@
 # License for the specific language governing permissions and limitations
 # under the License.

+import extras
 import json
 import logging
 import threading
+import time
 import traceback

 import gear

 from zuul.merger import merger

+statsd = extras.try_import('statsd.statsd')
+

 class MergeServer(object):
     log = logging.getLogger("zuul.MergeServer")
@@ -100,14 +104,23 @@ class MergeServer(object):
                 self.log.exception("Exception while getting job")

     def merge(self, job):
+        start_time = time.time()
         args = json.loads(job.arguments)
         commit = self.merger.mergeChanges(args['items'])
         result = dict(merged=(commit is not None),
                       commit=commit,
                       zuul_url=self.zuul_url)
         job.sendWorkComplete(json.dumps(result))
+        finish_time = time.time()
+        if statsd:
+            runtime = int((finish_time - start_time) * 1000)
+            # merge change is for last project in list
+            project = args['items'][-1]['project'].replace('/', '.')
+            key = 'zuul.merger.merge.%s' % project
+            statsd.timing(key + '.resident_time', runtime)

     def update(self, job):
+        start_time = time.time()
         args = json.loads(job.arguments)
         self.merger.updateRepo(args['project'],
                                args['connection_name'],
@@ -115,3 +128,10 @@ class MergeServer(object):
         result = dict(updated=True,
                       zuul_url=self.zuul_url)
         job.sendWorkComplete(json.dumps(result))
+        finish_time = time.time()
+        if statsd:
+            runtime = int((finish_time - start_time) * 1000)
+            # merge change is for last project in list
+            project = args['project'].replace('/', '.')
+            key = 'zuul.merger.update.%s' % project
+            statsd.timing(key + '.resident_time', runtime)