Add writeback option to metrics

CHANGES.txt

@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+2.3 (2015-10-22)
+
+- Add MANIFEST file
+
+2.2 (2015-10-22)
+----------------
+
+- Update CHANGES
+
+2.1 (2015-10-22)
+----------------
+
+- Detect if decorated method is class method or object method and behave
+  accordingly.
+
 2.0 (2013-12-10)
 ----------------
 

MANIFEST.in

@@ -0,0 +1,3 @@
+include *.txt
+include *.cfg
+include *.py

perfmetrics/__init__.py

@@ -11,6 +11,7 @@
 import functools
 import os
 import random
+import six
 
 
 try:  # pragma no cover
@@ -98,14 +99,15 @@ def somefunc():
 
     def __init__(self, stat=None, rate=1, method=False,
                  count=True, timing=True, timing_format='%s.t',
-                 random=random.random):  # testing hook
+                 random=random.random, wb_list=None):  # testing hook
         self.stat = stat
         self.rate = rate
         self.method = method
         self.count = count
         self.timing = timing
         self.timing_format = timing_format
         self.random = random
+        self.wb_list = wb_list
 
     def __call__(self, f):
         """Decorate a function or method so it can send statistics to statsd.
@@ -120,6 +122,7 @@ def __call__(self, f):
         timing = self.timing
         timing_format = self.timing_format
         random = self.random
+        wb_list = self.wb_list
 
         def call_with_metric(*args, **kw):
             if rate < 1 and random() >= rate:
@@ -135,7 +138,10 @@ def call_with_metric(*args, **kw):
             if instance_stat:
                 stat = instance_stat
             elif method:
-                cls = args[0].__class__
+                if isinstance(args[0], (type, six.class_types)):
+                    cls = args[0]
+                else:
+                    cls = args[0].__class__
                 stat = '%s.%s.%s' % (cls.__module__, cls.__name__, func_name)
             else:
                 stat = func_full_name
@@ -151,6 +157,8 @@ def call_with_metric(*args, **kw):
                     return f(*args, **kw)
                 finally:
                     elapsed_ms = int((time() - start) * 1000.0)
+                    if isinstance(wb_list, list):
+                        wb_list.append(elapsed_ms)
                     client.timing(timing_format % stat, elapsed_ms,
                                   rate, buf=buf, rate_applied=True)
                     if buf:
@@ -184,6 +192,8 @@ def __exit__(self, _typ, _value, _tb):
                     client.incr(stat, rate=rate, buf=buf, rate_applied=True)
                 if self.timing:
                     elapsed = int((time() - self.start) * 1000.0)
+                    if isinstance(self.wb_list, list):
+                        self.wb_list.append(elapsed)
                     client.timing(self.timing_format % stat, elapsed,
                                   rate=rate, buf=buf, rate_applied=True)
                 if buf:

perfmetrics/tests/test_perfmetrics.py

@@ -97,13 +97,17 @@ def test_ctor_with_defaults(self):
         self.assertEqual(obj.rate, 1)
         self.assertTrue(obj.count)
         self.assertTrue(obj.timing)
+        self.assertIsNone(obj.wb_list)
 
     def test_ctor_with_options(self):
-        obj = self._class('spam.n.eggs', 0.1, count=False, timing=False)
+        m_wb = list()
+        obj = self._class('spam.n.eggs', 0.1, count=False, timing=False,
+                          wb_list=m_wb)
         self.assertEqual(obj.stat, 'spam.n.eggs')
         self.assertEqual(obj.rate, 0.1)
         self.assertFalse(obj.count)
         self.assertFalse(obj.timing)
+        self.assertEqual(obj.wb_list, m_wb)
 
     def test_decorate_function(self):
         args = []

setup.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-requires = ['setuptools']
+requires = ['setuptools', 'six']
 
 if sys.version_info[:2] < (2, 7):
     requires.append('unittest2')
@@ -13,7 +13,7 @@
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 setup(name='perfmetrics',
-      version='2.0',
+      version='2.3',
       author='Shane Hathaway',
       author_email='shane@hathawaymix.org',
       description='Send performance metrics about Python code to Statsd',