Metrics: Follow conventions (thanks @cherti)

This commit is contained in:
Raphael Michel
2017-03-27 21:39:50 +02:00
parent 455b0f2015
commit e28030576a
4 changed files with 38 additions and 33 deletions

View File

@@ -36,27 +36,27 @@ def test_counter(monkeypatch):
monkeypatch.setattr(metrics, "redis", fake_redis, raising=False)
# now test
fullname_get = metrics.http_view_requests._construct_metric_identifier(
'http_view_requests', {"status_code": "200", "url_name": "foo", "method": "GET"}
fullname_get = metrics.pretix_view_requests_total._construct_metric_identifier(
'pretix_view_requests_total', {"status_code": "200", "url_name": "foo", "method": "GET"}
)
fullname_post = metrics.http_view_requests._construct_metric_identifier(
'http_view_requests', {"status_code": "200", "url_name": "foo", "method": "POST"}
fullname_post = metrics.pretix_view_requests_total._construct_metric_identifier(
'pretix_view_requests_total', {"status_code": "200", "url_name": "foo", "method": "POST"}
)
metrics.http_view_requests.inc(status_code="200", url_name="foo", method="GET")
metrics.pretix_view_requests_total.inc(status_code="200", url_name="foo", method="GET")
assert fake_redis.storage[fullname_get] == 1
metrics.http_view_requests.inc(status_code="200", url_name="foo", method="GET")
metrics.pretix_view_requests_total.inc(status_code="200", url_name="foo", method="GET")
assert fake_redis.storage[fullname_get] == 2
metrics.http_view_requests.inc(7, status_code="200", url_name="foo", method="GET")
metrics.pretix_view_requests_total.inc(7, status_code="200", url_name="foo", method="GET")
assert fake_redis.storage[fullname_get] == 9
metrics.http_view_requests.inc(7, status_code="200", url_name="foo", method="POST")
metrics.pretix_view_requests_total.inc(7, status_code="200", url_name="foo", method="POST")
assert fake_redis.storage[fullname_get] == 9
assert fake_redis.storage[fullname_post] == 7
with pytest.raises(ValueError):
metrics.http_view_requests.inc(-4, status_code="200", url_name="foo", method="POST")
metrics.pretix_view_requests_total.inc(-4, status_code="200", url_name="foo", method="POST")
with pytest.raises(ValueError):
metrics.http_view_requests.inc(-4, status_code="200", url_name="foo", method="POST", too="much")
metrics.pretix_view_requests_total.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")
@@ -137,6 +137,8 @@ def test_histogram(monkeypatch):
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
assert fake_redis.storage['my_histogram_bucket{dimension="one",le="10.0"}'] == 1
assert fake_redis.storage['my_histogram_bucket{dimension="one",le="+Inf"}'] == 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
@@ -144,14 +146,14 @@ def test_histogram(monkeypatch):
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="5.0"}'] == 3
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="5.0"}'] == 3
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
@@ -164,11 +166,11 @@ def test_metrics_view(monkeypatch, client):
monkeypatch.setattr(metricsview.metrics, "redis", fake_redis, raising=False)
counter_value = 3
fullname = metrics.http_view_requests._construct_metric_identifier(
fullname = metrics.pretix_view_requests_total._construct_metric_identifier(
'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")
metricsview.metrics.pretix_view_requests_total.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')