Suggestion from Julius

brian-brazil · brian-brazil · commit 3b58b5ed5942 · 2015-02-10T00:27:56.000Z
diff --git a/prometheus_client/__init__.py b/prometheus_client/__init__.py
@@ -169,19 +169,19 @@ def inc(self, amount=1):
       self._value += amount
 
   @contextmanager
-  def trackBlockRaises(self):
+  def countBlockExceptions(self):
     """Decorator to increment if a block raises an exception."""
     try:
       yield
     except Exception, e:
       self.inc()
       raise e
 
-  def trackFunctionRaises(self, f):
+  def countFunctionExceptions(self, f):
     """Decorator to increment if a function raises an exception."""
     @wraps(f)
     def wrapper(*args, **kwargs):
-      with self.trackBlockRaises():
+      with self.countBlockExceptions():
         return f(*args, **kwargs)
     return wrapper
 
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -19,7 +19,7 @@ def test_negative_increment_raises(self):
     self.assertRaises(ValueError, self.counter.inc, -1)
 
   def test_function_decorator(self):
-    @self.counter.trackFunctionRaises
+    @self.counter.countFunctionExceptions
     def f(r):
       if r:
         raise Exception
@@ -34,12 +34,12 @@ def f(r):
     self.assertEquals(1, self.registry.get_sample_value('c'))
 
   def test_block_decorator(self):
-    with self.counter.trackBlockRaises():
+    with self.counter.countBlockExceptions():
       pass
     self.assertEquals(0, self.registry.get_sample_value('c'))
     raised = False
     try:
-      with self.counter.trackBlockRaises():
+      with self.counter.countBlockExceptions():
         raise Exception
     except:
       raised = True
