Merge pull request #837 from glogiotatidis/978694

[fix bug 978694] Count hits to API Resources.

mozillians/api/resources.py

@@ -1,7 +1,7 @@
-# Implement HTTP Caching
-# code from http://django-tastypie.readthedocs.org/en/latest/caching.html
 from django.utils.cache import patch_cache_control
 
+from django_statsd.clients import statsd
+
 
 class ClientCacheResourceMixIn(object):
     """
@@ -11,6 +11,7 @@ class ClientCacheResourceMixIn(object):
 
     TODO: To be removed when we upgrade to django-tastypie >= 0.9.12.
 
+    Code from http://django-tastypie.readthedocs.org/en/latest/caching.html
     """
 
     def create_response(self, request, data, **response_kwargs):
@@ -39,3 +40,21 @@ def apply_sorting(self, obj_list, options=None):
             sort_list = self.Meta.default_order
 
         return obj_list.order_by(*sort_list)
+
+
+class GraphiteMixIn(object):
+    """
+    MixIn to post to graphite server every hit of API resource.
+    """
+
+    def wrap_view(self, view):
+        real_wrapper = super(GraphiteMixIn, self).wrap_view(view)
+
+        def wrapper(request, *args, **kwargs):
+            callback = getattr(self, view)
+            counter_name = 'api.resources.{klass}.{func}'.format(
+                klass=callback.im_class.__name__,
+                func=callback.im_func.__name__)
+            statsd.incr(counter_name)
+            return real_wrapper(request, *args, **kwargs)
+        return wrapper

mozillians/groups/api.py

@@ -9,13 +9,14 @@
 from mozillians.api.authenticators import AppAuthentication
 from mozillians.api.authorisers import MozillaOfficialAuthorization
 from mozillians.api.resources import (AdvancedSortingResourceMixIn,
-                                      ClientCacheResourceMixIn)
+                                      ClientCacheResourceMixIn,
+                                      GraphiteMixIn)
 from mozillians.api.paginator import Paginator
 from mozillians.groups.models import Group, Skill
 
 
 class GroupBaseResource(AdvancedSortingResourceMixIn, ClientCacheResourceMixIn,
-                        ModelResource):
+                        GraphiteMixIn, ModelResource):
     number_of_members = fields.IntegerField(attribute='number_of_members',
                                             readonly=True)
 

mozillians/users/api.py

@@ -19,7 +19,8 @@
 from mozillians.api.authorisers import MozillaOfficialAuthorization
 from mozillians.api.paginator import Paginator
 from mozillians.api.resources import (AdvancedSortingResourceMixIn,
-                                      ClientCacheResourceMixIn)
+                                      ClientCacheResourceMixIn,
+                                      GraphiteMixIn)
 from mozillians.users.models import COUNTRIES, UserProfile
 
 
@@ -74,7 +75,8 @@ def __getitem__(self, key):
 
 
 class LocationCustomResource(AdvancedSortingResourceMixIn,
-                             ClientCacheResourceMixIn, Resource):
+                             ClientCacheResourceMixIn, GraphiteMixIn,
+                             Resource):
 
     class Meta:
         authentication = AppAuthentication()
@@ -235,7 +237,7 @@ def dehydrate_url(self, bundle):
         return utils.absolutify(url)
 
 
-class UserResource(ClientCacheResourceMixIn, ModelResource):
+class UserResource(ClientCacheResourceMixIn, GraphiteMixIn, ModelResource):
     """User Resource."""
     email = fields.CharField(attribute='user__email', null=True, readonly=True)
     username = fields.CharField(attribute='user__username', null=True, readonly=True)