Merge 6187c00 into 013f8ac

CHANGES.rst

@@ -9,6 +9,11 @@ TODO
 * Introspectables
 * Content negociation: we should add content type in cache key.
 
+Development
+-----------
+
+* Fix invalid Graphite metric names (replace periods/colon with underscore)
+
 0.2.3
 -----
 

pyramid_caching/ext/metrics.py

@@ -36,4 +36,5 @@ def cache_miss(event):
 
 def count_view_cache_event(event, access):
     metrics = event.request.metrics
-    metrics.incr(('cache.%s' % access, event.cache_key.root()))
+    key = event.cache_key.root().replace(':', '_').replace('.', '_')
+    metrics.incr(('cache.%s' % access, key))

pyramid_caching/tests/functional/test_metrics.py

@@ -25,7 +25,7 @@ def test_cache_miss(self, m_statsd):
         self.app.get('/users/1')
         m_incr = m_statsd.return_value.incr
         m_incr.assert_called_once_with(
-            'cache.miss.example.views:get_user:http', count=1)
+            'cache.miss.example_views_get_user_http', count=1)
 
     @mock.patch('pyramid_metrics.utility.StatsClient')
     def test_cache_hit(self, m_statsd):
@@ -34,8 +34,8 @@ def test_cache_hit(self, m_statsd):
 
         m_incr = m_statsd.return_value.incr
         m_incr.assert_has_calls([
-            mock.call('cache.miss.example.views:get_user:http', count=1),
-            mock.call('cache.hit.example.views:get_user:http', count=1),
+            mock.call('cache.miss.example_views_get_user_http', count=1),
+            mock.call('cache.hit.example_views_get_user_http', count=1),
             ])
 
 

pyramid_caching/tests/unittests/test_metrics_extension.py

@@ -9,14 +9,14 @@ def test_cache_hit(self):
         event = DummyEvent()
         cache_hit(event)
         self.assertEqual(len(event.request.metrics.keys), 1)
-        self.assertEqual(event.request.metrics.keys[0], ('cache.hit', 'a:b'))
+        self.assertEqual(event.request.metrics.keys[0], ('cache.hit', 'a_b'))
 
     def test_cache_miss(self):
         from pyramid_caching.ext.metrics import cache_miss
         event = DummyEvent()
         cache_miss(event)
         self.assertEqual(len(event.request.metrics.keys), 1)
-        self.assertEqual(event.request.metrics.keys[0], ('cache.miss', 'a:b'))
+        self.assertEqual(event.request.metrics.keys[0], ('cache.miss', 'a_b'))
 
 
 class DummyEvent:

requirements-test.txt

@@ -5,7 +5,7 @@ nose-parameterized
 coverage
 mock
 webtest
-yanc
+yanc==0.2.4
 Paste
 PasteDeploy
 coveralls