Merge 5faa539 into 02331c5

appmetrics/metrics.py

@@ -137,6 +137,12 @@ def new_meter(name, tick_interval=5):
 
     return new_metric(name, meter.Meter, tick_interval)
 
+def new_timer(name):
+    """
+    Build a new "timer" metric
+    """
+
+    return new_metric(name, simple_metrics.Timer)
 
 def new_histogram_with_implicit_reservoir(name, reservoir_type='uniform', *reservoir_args, **reservoir_kwargs):
     """

appmetrics/simple_metrics.py

@@ -19,7 +19,7 @@
 """
 
 import threading
-
+import time
 
 class Counter(object):
     """
@@ -82,3 +82,38 @@ def get(self):
 
     def raw_data(self):
         return self.value
+
+class Timer(object):
+    """
+    A simple timer, with function timing support
+    """
+
+    def __init__(self):
+        self.value = 0
+        self.lock = threading.Lock()
+
+    def start(self):
+        self.startTime = time.time();
+
+    def stop(self):
+        self.endTime = time.time()
+        self.value = (self.endTime - self.startTime)
+
+    def time(self, function, *args):
+        """
+        Times a function. Format should be timer.time(function, arguments))
+        """
+        self.startTime = time.time()
+        x = function(*args)
+        self.value = (time.time() - self.startTime)
+        return x
+
+    def get(self):
+        """
+        Return the timer's current value
+        """
+
+        return dict(kind="timer", value=self.value)
+
+    def raw_data(self):
+        return self.value