Merge lp:~ricardokirkner/rnr-server/sentry into lp:rnr-server

[Ricardo Kirkner]

add sentry support

[Matt Goodall (matt-goodall)]

lgtm, with inline question. Approving now to not block.

review: Approve

[lp:~ricardokirkner/rnr-server/sentry]

325. By Ricardo Kirkner on 2017-03-17

remove unnecessary celery related settings

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2016-05-25 14:09:04 +0000
+++ django_project/settings_base.py	2017-03-17 12:11:25 +0000
@@ -1,5 +1,7 @@
 import os.path
 
+from versioninfo import version_info
+
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 SRC_DIR = os.path.join(BASE_DIR, 'src')
@@ -141,6 +143,8 @@
     'piston',
     'preflight',
     'pgtools',
+    'raven.contrib.django.raven_compat',
+    'canonical_raven',
 ]
 INTERNAL_IPS = []
 LANGUAGES = [
@@ -286,6 +290,8 @@
 MEDIA_URL = '/site_media/'
 MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
 MIDDLEWARE_CLASSES = [
+    'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware',  #noqa
+    'canonical_raven.middleware.RavenContextMiddleware',
     'django.middleware.http.ConditionalGetMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -340,6 +346,18 @@
 PRELOAD_API_SERVICE_ROOTS = False
 PREPEND_WWW = False
 PROFANITIES_LIST = []
+RAVEN_CONFIG = {
+    # 'dsn': 'http://api:[e-mail]/project_id',
+    'release': version_info['revno'],
+    'string_max_length': 16000,
+    'processors': [
+        'raven.processors.SanitizePasswordsProcessor',
+        'raven.processors.RemoveStackLocalsProcessor',
+        'raven.processors.RemovePostDataProcessor',
+        'canonical_raven.processors.RemoveCookiesProcessor',
+        'canonical_raven.processors.SanitizeTimelineDjangoProcessor',
+    ],
+}
 REVIEWSAPP_MEDIA_ROOT = os.path.join(SRC_DIR, 'reviewsapp', 'media')
 ROOT_URLCONF = 'urls'
 SCA_APPS_CACHE_TIMEOUT = 3600
@@ -423,6 +441,7 @@
 USE_ETAGS = False
 USE_I18N = True
 USE_L10N = True
+USE_SENTRY = True
 USE_THOUSAND_SEPARATOR = False
 USE_TZ = True
 USE_X_FORWARDED_HOST = True

=== modified file 'django_project/settings_devel.py'
--- django_project/settings_devel.py	2015-12-14 07:43:03 +0000
+++ django_project/settings_devel.py	2017-03-17 12:11:25 +0000
@@ -14,3 +14,4 @@
     os.path.join(BASE_DIR, 'django_project', 'templates'),
 ]
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
+USE_SENTRY = False

=== modified file 'requirements.txt'
--- requirements.txt	2016-05-13 14:05:48 +0000
+++ requirements.txt	2017-03-17 12:11:25 +0000
@@ -1,4 +1,5 @@
 amqp==1.4.5
+canonical-raven==0.0.3
 django==1.6.10
 django-openid-auth==0.6             # bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/django-openid-auth/trunk@114
 django-pgtools==0.2                 # bzr+ssh://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk@8
@@ -12,6 +13,7 @@
 oops-dictconfig==0.0.4
 oops-wsgi==0.0.11                   # bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/python-oops-wsgi/stable@39
 
+raven==5.6.0
 requests==2.6.0
 requests-oauthlib==0.5.0
 south==1.0.2

=== modified file 'src/core/wsgi.py'
--- src/core/wsgi.py	2015-06-12 04:56:30 +0000
+++ src/core/wsgi.py	2017-03-17 12:11:25 +0000
@@ -2,6 +2,7 @@
 import oops_wsgi
 import uuid
 
+from canonical_raven.middleware import Sentry
 from django.conf import settings
 from django.core.handlers import wsgi
 
@@ -67,9 +68,11 @@
     config = oops_dictconfig.config_from_dict(settings.OOPSES)
     oops_wsgi.install_hooks(config)
     soft_timeout = settings.SOFT_TIMEOUT_MILLISECONDS
-    oops_app = oops_wsgi.make_app(non_oops_app, config, oops_on_status=['500'],
-                                  soft_start_timeout=soft_timeout)
-    return oops_app
+    app = oops_wsgi.make_app(non_oops_app, config, oops_on_status=['500'],
+                             soft_start_timeout=soft_timeout)
+    if settings.USE_SENTRY:
+        app = Sentry(app, soft_start_timeout=soft_timeout)
+    return app
 
 
 application = make_app()

=== modified file 'src/reviewsapp/templates/500.html'
--- src/reviewsapp/templates/500.html	2014-01-03 11:11:18 +0000
+++ src/reviewsapp/templates/500.html	2017-03-17 12:11:25 +0000
@@ -9,9 +9,12 @@
 <h1>{% trans 'Server Error <em>(500)</em>' %}</h1>
 {% if errormsg %}<p>{{ errormsg }}</p>{% endif %}
 <p>{% blocktrans %}An error occurred which prevented the page you requested from loading. If this problem continues, please consider reporting this problem by sending an e-mail to <a href="mailto:[e-mail]">[e-mail]</a>{% endblocktrans %}</p>
-<p>
+<p id="oops_id">
 	{% blocktrans %}(Error <abbr>ID</abbr>: ){% endblocktrans %} {{ oops_id }}
 </p>
+{% if request.sentry.id %}
+<p id="sentry_id">Sentry ID: {{ request.sentry.id }}</p>
+{% endif %}
 <pre style="overflow:auto">
 	{{ traceback }}
 </pre>