statsd and commonware > django_statsd

apps/amo/middleware.py

@@ -20,7 +20,7 @@ import lxml.html
 import MySQLdb as mysql
 import tower
 import jingo
-from statsd import statsd
+from django_statsd.clients import statsd
 
 import amo
 from . import urlresolvers

apps/amo/search.py

@@ -4,7 +4,7 @@ from operator import itemgetter
 from django.conf import settings
 
 import elasticutils
-from statsd import statsd
+from django_statsd.clients import statsd
 
 log = logging.getLogger('z.es')
 

apps/amo/tasks.py

@@ -9,7 +9,7 @@ import redisutils
 import phpserialize
 from celeryutils import task
 from hera.contrib.django_utils import flush_urls
-from statsd import statsd
+from django_statsd.clients import statsd
 
 import amo
 from addons.models import Addon

apps/amo/views.py

@@ -12,7 +12,7 @@ import jingo
 import waffle
 from django_arecibo.tasks import post
 from django_statsd.views import record as django_statsd_record
-from statsd import statsd
+from django_statsd.clients import statsd
 
 import amo
 import api

apps/devhub/tasks.py

@@ -16,7 +16,7 @@ from django.core.management import call_command
 from django.utils.http import urlencode
 
 from celeryutils import task
-from statsd import statsd
+from django_statsd.clients import statsd
 from tower import ugettext as _
 
 import amo

apps/files/models.py

@@ -20,8 +20,8 @@ from django.template.defaultfilters import slugify
 from django.utils.encoding import smart_str
 
 import commonware
+from django_statsd.clients import statsd
 import path
-from statsd import statsd
 from uuidfield.fields import UUIDField
 import waffle
 

apps/paypal/__init__.py

@@ -11,7 +11,7 @@ from django.conf import settings
 from django.utils.http import urlencode, urlquote
 
 import commonware.log
-from statsd import statsd
+from django_statsd.clients import statsd
 
 from amo.helpers import absolutify, loc, urlparams
 from amo.urlresolvers import reverse

apps/paypal/views.py

@@ -9,8 +9,8 @@ from django.core.cache import cache
 from django.views.decorators.csrf import csrf_exempt
 
 import commonware.log
+from django_statsd.clients import statsd
 import phpserialize as php
-from statsd import statsd
 
 import amo
 from amo.decorators import no_login_required, post_required, write

apps/users/views.py

@@ -19,11 +19,11 @@ from django_browserid.auth import BrowserIDBackend
 from waffle.decorators import waffle_flag, waffle_switch
 
 import commonware.log
+from django_statsd.clients import statsd
 import jingo
 from radagast.wizard import Wizard
 from tower import ugettext as _, ugettext_lazy as _lazy
 from session_csrf import anonymous_csrf, anonymous_csrf_exempt
-from statsd import statsd
 from mobility.decorators import mobile_template
 import waffle
 

settings.py

@@ -277,8 +277,8 @@ def JINJA_CONFIG():
 
 MIDDLEWARE_CLASSES = (
     # AMO URL middleware comes first so everyone else sees nice URLs.
-    'commonware.response.middleware.GraphiteRequestTimingMiddleware',
-    'commonware.response.middleware.GraphiteMiddleware',
+    'django_statsd.middleware.GraphiteRequestTimingMiddleware',
+    'django_statsd.middleware.GraphiteMiddleware',
     'amo.middleware.LocaleAndAppURLMiddleware',
     # Mobile detection should happen in Zeus.
     'mobility.middleware.DetectMobileMiddleware',
@@ -380,6 +380,7 @@ INSTALLED_APPS = (
 
     # Has to load after auth
     'django_browserid',
+    'django_statsd',
     'radagast',
 )