From 39f815a6bb59f5153c45d969223834ba3ecc5e92 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Mon, 12 Mar 2018 12:18:56 -0400 Subject: [PATCH] fix bug 1442022 - nix new relic We don't use new relic much anymore, so this nixes it. --- docker/config/local_dev.env | 1 - requirements/default.txt | 2 -- webapp-django/wsgi/socorro-crashstats.py | 21 --------------------- 3 files changed, 24 deletions(-) diff --git a/docker/config/local_dev.env b/docker/config/local_dev.env index 8ce220d9a2..2310f68133 100644 --- a/docker/config/local_dev.env +++ b/docker/config/local_dev.env @@ -92,7 +92,6 @@ AWS_SECRET_ACCESS_KEY=foo CACHE_LOCATION=memcached:11211 DATABASE_URL=postgres://postgres:aPassword@postgresql:5432/breakpad ELASTICSEARCH_URLS=http://elasticsearch:9200 -NEWRELIC_PYTHON_INI_FILE=/etc/newrelic/newrelic.ini OAUTH2_CLIENT_ID= OAUTH2_CLIENT_SECRET= RABBITMQ_HOST=rabbitmq diff --git a/requirements/default.txt b/requirements/default.txt index 7736fde768..711ac001c0 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -136,8 +136,6 @@ datadog==0.19.0 \ freezegun==0.3.9 \ --hash=sha256:8842688de9497c82ecb40c30274ecc676e97ac78765b0ade105a97063d5b7a11 \ --hash=sha256:783ccccd7f60968bfe49ad9e114c18ea2b63831faaaf61c1f1f71ddfde1c0eee -newrelic==2.106.0.87 \ - --hash=sha256:8f66edadcf8db74836fa804fcdd19d3fcfe9e080a8db411af34f2a9148e29eac contextlib2==0.5.5 \ --hash=sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00 \ --hash=sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48 diff --git a/webapp-django/wsgi/socorro-crashstats.py b/webapp-django/wsgi/socorro-crashstats.py index 39762f8421..05cffcb608 100644 --- a/webapp-django/wsgi/socorro-crashstats.py +++ b/webapp-django/wsgi/socorro-crashstats.py @@ -1,29 +1,8 @@ from __future__ import print_function import os -import sys os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'crashstats.settings') from django.core.wsgi import get_wsgi_application # noqa application = get_wsgi_application() - - -try: - import newrelic.agent -except ImportError: - newrelic = False - - -if newrelic: - newrelic_ini = os.getenv('NEWRELIC_PYTHON_INI_FILE', None) - if newrelic_ini: - if os.path.isfile(newrelic_ini): - newrelic.agent.initialize(newrelic_ini) - application = newrelic.agent.wsgi_application()(application) - else: - print( - "NEWRELIC_PYTHON_INI_FILE set but file does not exist. " - "Skipping to initialize newrelic agent.", - file=sys.stderr - )