Pass metric instance and callback name to Timer

This should make the code slightly more readable.

Signed-off-by: Andreas Zeidler <andreas.zeidler@zeit.de>

prometheus_client/context_managers.py

@@ -42,11 +42,12 @@ def wrapped(func, *args, **kwargs):
 
 
 class Timer:
-    def __init__(self, callback):
-        self._callback = callback
+    def __init__(self, metric, callback_name):
+        self._metric = metric
+        self._callback_name = callback_name
 
     def _new_timer(self):
-        return self.__class__(self._callback)
+        return self.__class__(self._metric, self._callback_name)
 
     def __enter__(self):
         self._start = default_timer()
@@ -55,15 +56,12 @@ def __enter__(self):
     def __exit__(self, typ, value, traceback):
         # Time can go backwards.
         duration = max(default_timer() - self._start, 0)
-        instance = self._callback.__self__
-        instance._raise_if_not_observable()
-        self._callback(duration)
+        self._metric._raise_if_not_observable()
+        callback = getattr(self._metric, self._callback_name)
+        callback(duration)
 
     def labels(self, *args, **kw):
-        instance = self._callback.__self__
-        self._callback = getattr(
-            instance.labels(*args, **kw),
-            self._callback.__name__)
+        self._metric = self._metric.labels(*args, **kw)
 
     def __call__(self, f):
         def wrapped(func, *args, **kwargs):

prometheus_client/metrics.py

@@ -396,7 +396,7 @@ def time(self):
 
         Can be used as a function decorator or context manager.
         """
-        return Timer(self.set)
+        return Timer(self, 'set')
 
     def set_function(self, f):
         """Call the provided function to return the Gauge value.
@@ -474,7 +474,7 @@ def time(self):
 
         Can be used as a function decorator or context manager.
         """
-        return Timer(self.observe)
+        return Timer(self, 'observe')
 
     def _child_samples(self):
         return (
@@ -598,7 +598,7 @@ def time(self):
 
         Can be used as a function decorator or context manager.
         """
-        return Timer(self.observe)
+        return Timer(self, 'observe')
 
     def _child_samples(self):
         samples = []