Fix and extend metrics tests

src/tests/base/test_metrics.py

@@ -14,16 +14,16 @@ class FakeRedis(object):
     def __init__(self):
         self.storage = {}
 
-    def incrbyfloat(self, rkey, amount):
+    def hincrbyfloat(self, k, rkey, amount):
         if rkey in self.storage:
             self.storage[rkey] += amount
         else:
-            self.set(rkey, amount)
+            self.hset(k, rkey, amount)
 
-    def set(self, rkey, value):
+    def hset(self, k, rkey, value):
         self.storage[rkey] = value
 
-    def get(self, rkey):
+    def hget(self, k, rkey):
         # bytes-conversion here for emulating redis behavior without making incr too hard
         return bytes(self.storage[rkey], encoding='utf-8')
 
@@ -36,33 +36,33 @@ def test_counter(monkeypatch):
     monkeypatch.setattr(metrics, "redis", fake_redis, raising=False)
 
     # now test
-    fullname_get = metrics.http_requests_total._construct_metric_identifier(
+    fullname_get = metrics.http_view_requests._construct_metric_identifier(
-        'http_requests_total', {"code": "200", "handler": "/foo", "method": "GET"}
+        'http_view_requests', {"status_code": "200", "url_name": "foo", "method": "GET"}
     )
-    fullname_post = metrics.http_requests_total._construct_metric_identifier(
+    fullname_post = metrics.http_view_requests._construct_metric_identifier(
-        'http_requests_total', {"code": "200", "handler": "/foo", "method": "POST"}
+        'http_view_requests', {"status_code": "200", "url_name": "foo", "method": "POST"}
     )
-    metrics.http_requests_total.inc(code="200", handler="/foo", method="GET")
+    metrics.http_view_requests.inc(status_code="200", url_name="foo", method="GET")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_get] == 1
+    assert fake_redis.storage[fullname_get] == 1
-    metrics.http_requests_total.inc(code="200", handler="/foo", method="GET")
+    metrics.http_view_requests.inc(status_code="200", url_name="foo", method="GET")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_get] == 2
+    assert fake_redis.storage[fullname_get] == 2
-    metrics.http_requests_total.inc(7, code="200", handler="/foo", method="GET")
+    metrics.http_view_requests.inc(7, status_code="200", url_name="foo", method="GET")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_get] == 9
+    assert fake_redis.storage[fullname_get] == 9
-    metrics.http_requests_total.inc(7, code="200", handler="/foo", method="POST")
+    metrics.http_view_requests.inc(7, status_code="200", url_name="foo", method="POST")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_get] == 9
+    assert fake_redis.storage[fullname_get] == 9
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_post] == 7
+    assert fake_redis.storage[fullname_post] == 7
 
     with pytest.raises(ValueError):
-        metrics.http_requests_total.inc(-4, code="200", handler="/foo", method="POST")
+        metrics.http_view_requests.inc(-4, status_code="200", url_name="foo", method="POST")
 
     with pytest.raises(ValueError):
-        metrics.http_requests_total.inc(-4, code="200", handler="/foo", method="POST", too="much")
+        metrics.http_view_requests.inc(-4, status_code="200", url_name="foo", method="POST", too="much")
 
     # test dimensionless counters
     dimless_counter = metrics.Counter("dimless_counter", "this is a helpstring")
     fullname_dimless = dimless_counter._construct_metric_identifier('dimless_counter')
     dimless_counter.inc(20)
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_dimless] == 20
+    assert fake_redis.storage[fullname_dimless] == 20
 
 
 @override_settings(HAS_REDIS=True)
@@ -80,29 +80,29 @@ def test_gauge(monkeypatch):
     fullname_three = test_gauge._construct_metric_identifier('my_gauge', {"dimension": "three"})
 
     test_gauge.inc(dimension="one")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 1
+    assert fake_redis.storage[fullname_one] == 1
     test_gauge.inc(7, dimension="one")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 8
+    assert fake_redis.storage[fullname_one] == 8
     test_gauge.dec(2, dimension="one")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
     test_gauge.set(3, dimension="two")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_two] == 3
+    assert fake_redis.storage[fullname_two] == 3
     test_gauge.set(4, dimension="two")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_two] == 4
+    assert fake_redis.storage[fullname_two] == 4
     test_gauge.dec(7, dimension="three")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_two] == 4
+    assert fake_redis.storage[fullname_two] == 4
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_three] == -7
+    assert fake_redis.storage[fullname_three] == -7
     test_gauge.inc(14, dimension="three")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_two] == 4
+    assert fake_redis.storage[fullname_two] == 4
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_three] == 7
+    assert fake_redis.storage[fullname_three] == 7
     test_gauge.set(17, dimension="three")
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_one] == 6
+    assert fake_redis.storage[fullname_one] == 6
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_two] == 4
+    assert fake_redis.storage[fullname_two] == 4
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_three] == 17
+    assert fake_redis.storage[fullname_three] == 17
 
     with pytest.raises(ValueError):
         test_gauge.inc(-17, dimension="three")
@@ -120,7 +120,40 @@ def test_gauge(monkeypatch):
     dimless_gauge = metrics.Gauge("dimless_gauge", "this is a helpstring")
     fullname_dimless = dimless_gauge._construct_metric_identifier('dimless_gauge')
     dimless_gauge.set(20)
-    assert fake_redis.storage[metrics.REDIS_KEY_PREFIX + fullname_dimless] == 20
+    assert fake_redis.storage[fullname_dimless] == 20
+
+
+@override_settings(HAS_REDIS=True)
+def test_histogram(monkeypatch):
+
+    fake_redis = FakeRedis()
+
+    monkeypatch.setattr(metrics, "redis", fake_redis, raising=False)
+
+    test_hist = metrics.Histogram("my_histogram", "this is a helpstring", ["dimension"])
+
+    # now test
+    test_hist.observe(3.0, dimension="one")
+    assert fake_redis.storage['my_histogram_count{dimension="one"}'] == 1
+    assert fake_redis.storage['my_histogram_sum{dimension="one"}'] == 3.0
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="5.0"}'] == 1
+    test_hist.observe(3.0, dimension="one")
+    assert fake_redis.storage['my_histogram_count{dimension="one"}'] == 2
+    assert fake_redis.storage['my_histogram_sum{dimension="one"}'] == 6.0
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="5.0"}'] == 2
+    test_hist.observe(0.9, dimension="one")
+    assert fake_redis.storage['my_histogram_count{dimension="one"}'] == 3
+    assert fake_redis.storage['my_histogram_sum{dimension="one"}'] == 6.9
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="5.0"}'] == 2
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="1.0"}'] == 1
+    test_hist.observe(0.9, dimension="two")
+    assert fake_redis.storage['my_histogram_count{dimension="one"}'] == 3
+    assert fake_redis.storage['my_histogram_count{dimension="two"}'] == 1
+    assert fake_redis.storage['my_histogram_sum{dimension="one"}'] == 6.9
+    assert fake_redis.storage['my_histogram_sum{dimension="two"}'] == 0.9
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="5.0"}'] == 2
+    assert fake_redis.storage['my_histogram_bucket{dimension="one",le="1.0"}'] == 1
+    assert fake_redis.storage['my_histogram_bucket{dimension="two",le="1.0"}'] == 1
 
 
 @pytest.mark.django_db
@@ -131,8 +164,11 @@ def test_metrics_view(monkeypatch, client):
     monkeypatch.setattr(metricsview.metrics, "redis", fake_redis, raising=False)
 
     counter_value = 3
-    fullname = metrics.http_requests_total._construct_metric_identifier('http_requests_total', {"code": "200", "handler": "/foo", "method": "GET"})
+    fullname = metrics.http_view_requests._construct_metric_identifier(
-    metricsview.metrics.http_requests_total.inc(counter_value, code="200", handler="/foo", method="GET")
+        'http_requests_total',
+        {"status_code": "200", "url_name": "foo", "method": "GET"}
+    )
+    metricsview.metrics.http_view_requests.inc(counter_value, status_code="200", url_name="foo", method="GET")
 
     # test unauthorized-page
     assert "You are not authorized" in client.get('/metrics').content.decode('utf-8')