Bug 1169944 - Always install the New Relic package, not just on prod

For bug 1124278, we're going to want to sprinkle new relic annotations
around the codebase, so by always installing it, we save having to stub
these out in development/on Travis. It also seems wise to have prod
running as close to the same packages as in development.

Since NEW_RELIC_LICENSE_KEY isn't set locally, plus
NEW_RELIC_DEVELOPER_MODE is set to true, the New Relic agent doesn't
submit anything. See:
https://docs.newrelic.com/docs/agents/python-agent/installation-configuration/python-agent-configuration#developer_mode

deployment/update/update.py

@@ -56,7 +56,7 @@ def update(ctx):
         execfile(activate_script, dict(__file__=activate_script))
         # Install requirements using peep, so hashes are verified.
         with ctx.lcd(th_service_src):
-            ctx.local('python2.7 bin/peep.py install -r requirements/common.txt -r requirements/prod.txt')
+            ctx.local('python2.7 bin/peep.py install -r requirements/common.txt')
         # Make the virtualenv relocatable since paths are hard-coded by default.
         ctx.local('virtualenv --relocatable venv')
         # Fix lib64 symlink to be relative instead of absolute.

puppet/manifests/vagrant.pp

@@ -38,6 +38,7 @@ export DATABASE_URL='mysql://${DB_USER}:${DB_PASS}@localhost/treeherder'
 export DATABASE_URL_RO='mysql://${DB_USER}:${DB_PASS}@localhost/treeherder'
 export TREEHERDER_DEBUG='1'
 export TREEHERDER_DJANGO_SECRET_KEY='${DJANGO_SECRET_KEY}'
+export NEW_RELIC_DEVELOPER_MODE='True'
 "
 }
 

requirements.txt

@@ -5,7 +5,6 @@
 # HEROKU REQUIREMENTS
 
 -r requirements/common.txt
--r requirements/prod.txt
 
 # Pylibmc must be in this file so that heroku knows it has to install
 # libmemcached when bootstrapping the containers.

requirements/common.txt

@@ -25,6 +25,9 @@ kombu==3.0.26
 # sha256: Y9f3sUog8p90Mlpp5ttFkl6vbjoAPqtGwCNP0FCoyT8
 simplejson==3.7.3
 
+# sha256: WbUVu327zdMH-BesOIVOgIOev6M8XbeX9lRQeTyUXA0
+newrelic==2.52.0.40
+
 # Required by datasource
 # sha256: gRBAtkfl1WhvhNtBXv1pfmJQAIsRK2kJunesBZ4UDHQ
 MySQL-python==1.2.5

requirements/prod.txt

@@ -2,5 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
 
-# sha256: WbUVu327zdMH-BesOIVOgIOev6M8XbeX9lRQeTyUXA0
+# Delete this file once we've done at least one deploy after bug 1169944 (since update.py needed updating)
-newrelic==2.52.0.40

treeherder/webapp/wsgi.py

@@ -10,12 +10,9 @@ and any production WSGI deployments. It should expose a module-level variable
 named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
 this application via the ``WSGI_APPLICATION`` setting.
 """
-try:
 import newrelic.agent
-except ImportError:
-    newrelic = False
 
-if newrelic:
+# The New Relic agent must be initialised before anything else is imported.
 newrelic.agent.initialize()
 
 import os
@@ -42,7 +39,7 @@ application = get_wsgi_application()
 # referenced by WHITENOISE_ROOT at the site root.
 application = CustomWhiteNoise(application)
 
-if newrelic:
+# Wrap with the New Relic agent.
 application = newrelic.agent.WSGIApplicationWrapper(application)
 
 # Fix django closing connection to MemCachier after every request: