Merge ~suligap/canonical-identity-provider:talisker-init-with-sentry-overhaul into canonical-identity-provider:master

[Przemysław Suliga]

Switch to talisker and simplify/standardise the Sentry config

Description in the commit message.

Required dependencies MP: https://code.launchpad.net/~suligap/canonical-identity-provider/dependencies-talisker/+merge/384255.

Looks like the charm itself is already talisker aware and will use it instead of gunicorn if it's installed: https://bazaar.launchpad.net/~ubuntuone-pqm-team/canonical-identity-provider/charm/view/head:/playbook.yaml#L89

[Daniel Manrique (roadmr)]

LGTM, I like that the changes are pretty well-localized and not too intrusive.

review: Approve

[Przemysław Suliga (suligap)]

Thanks for the reviews Daniel!

I've added the mentioned soft request timeout config for talisker in https://code.launchpad.net/~suligap/canonical-identity-provider/charm-talisker-soft-request-timeout/+merge/384493

diff --git a/Makefile b/Makefile
index d76add8..8b077a1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ CONFIGMANAGER = config-manager.txt
 CONN_CHECK_CONFIG_PATH ?= /tmp/sso_conn_check_config.yaml
 DJANGO_SETTINGS_MODULE ?= settings
 ENV = $(CURDIR)/env
+GUNICORN = $(ENV)/bin/talisker
 JUJU_ENV ?= local
 JUJU_REPO ?= ../.juju-repo
 LOCAL_SETTINGS_DIR ?= $(CURDIR)/../local_config
@@ -200,7 +201,7 @@ manage:  ## Run django management commands
 run: ARGS=0.0.0.0:8000
 run: PID_ID=gunicorn
 run: collectstatic django-check  ## Start development server
-	$(ENV)/bin/gunicorn django_project.wsgi:application --workers=2 --reload --pid=logs/$(PID_ID).pid --bind=$(ARGS) --timeout=99999 --error-logfile=- --access-logfile=- $(SSL_CONFIG)
+	DEVEL=1 $(GUNICORN) django_project.wsgi:application --workers=2 --reload --pid=logs/$(PID_ID).pid --bind=$(ARGS) --error-logfile=- --access-logfile=- $(SSL_CONFIG)
 
 run-ssl: dev-sso.crt
 	$(MAKE) run SSL_CONFIG="--certfile=dev-sso.crt --keyfile=dev-sso.key --ssl-version 2" ARGS=0.0.0.0:8443 SSO_ROOT_URL=https://sso-xenial:8443 PID_ID=gunicorn-ssl
diff --git a/django_project/settings_base.py b/django_project/settings_base.py
index e0aa795..561acbf 100644
--- a/django_project/settings_base.py
+++ b/django_project/settings_base.py
@@ -214,6 +214,7 @@ INSTALLED_APPS = [
     'pgtools',
     'piston',
     'preflight',
+    'raven.contrib.django.raven_compat',
     'saml2idp',
 
     # own apps
@@ -221,8 +222,6 @@ INSTALLED_APPS = [
     'identityprovider',
     'ubuntu_sso_saml',
     'webui',
-    'raven.contrib.django.raven_compat',
-    'canonical_raven',
 ]
 INTERNAL_IPS = []
 LANGUAGES = [
@@ -357,6 +356,12 @@ LOGGING = {
             'filters': [],
             'handlers': ['file'],
         },
+        'talisker.wsgi': {
+            'level': 'WARNING',
+            'propagate': False,
+            'filters': [],
+            'handlers': ['file'],
+        },
     },
     'root': {
         'level': 'INFO',
@@ -383,7 +388,6 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
 MIDDLEWARE_CLASSES = [
     ('raven.contrib.django.raven_compat.middleware'
      '.SentryResponseErrorIdMiddleware'),
-    'canonical_raven.middleware.RavenContextMiddleware',
     'api.v20.utils.EnsureJSONResponseOnAPIErrorMiddleware',
     'identityprovider.middleware.http.SetRemoteAddrFromForwardedFor',
     'identityprovider.middleware.statsd.PistonRequestTimingMiddleware',
@@ -470,15 +474,8 @@ RAVEN_CONFIG = {
     # 'dsn': 'http://api:[e-mail]/project_id',
     'release': version_info['revno'],
     'string_max_length': 16000,
-    'install_sql_hook': False,
     'CELERY_LOGLEVEL': logging.WARN,
-    'processors': [
-        'raven.processors.SanitizePasswordsProcessor',
-        'raven.processors.RemoveStackLocalsProcessor',
-        'raven.processors.RemovePostDataProcessor',
-        'canonical_raven.processors.RemoveCookiesProcessor',
-        'canonical_raven.processors.SanitizeTimelineDjangoProcessor',
-    ],
+    # talisker takes care of setting safe defaults for raven.
 }
 READ_ONLY_MODE = False
 ROOT_URLCONF = 'django_project.urls'
@@ -500,6 +497,7 @@ SECURE_PROXY_SSL_HEADER = None
 SECURE_SSL_REDIRECT = False
 SEND_BROKEN_LINK_EMAILS = False
 SENTRY_CELERY_LOGLEVEL = logging.WARN
+SENTRY_CLIENT = 'talisker.django.SentryClient'
 SERVER_EMAIL = '[e-mail]'
 SESSION_CACHE_ALIAS = 'default'
 SESSION_COOKIE_AGE = 1209600
@@ -614,7 +612,6 @@ TWOFACTOR_TTL = 48 * 3600  # 48 hs
 USE_ETAGS = False
 USE_I18N = True
 USE_L10N = True
-USE_SENTRY = True
 USE_THOUSAND_SEPARATOR = False
 USE_TZ = False
 USE_X_FORWARDED_HOST = False
diff --git a/django_project/settings_devel.py b/django_project/settings_devel.py
index a3466f8..da15108 100644
--- a/django_project/settings_devel.py
+++ b/django_project/settings_devel.py
@@ -47,4 +47,3 @@ TWOFACTOR_MANDATORY_TEAMS = ['ubuntuone-hackers']
 # Load a minimal blacklist in development so as to not need too much
 # time and memory and not break any tests
 PASSWORD_BLACKLIST_FILE = os.path.join(BASE_DIR, "blacklist-devel.txt")
-USE_SENTRY = False
diff --git a/requirements.txt b/requirements.txt
index 39def16..0577502 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 bson==0.3.4
-canonical-raven==0.0.3
 cffi==1.6.0
 conn-check-configs==1.0.3
 convoy==0.4.1
@@ -17,7 +16,7 @@ django-secure==1.0.1
 django-statsd-mozilla==0.4.0
 enum34==1.1.6
 gargoyle-yplan==1.2.5
-gunicorn==19.3.0
+gunicorn==19.10.0
 idna==2.1
 ipaddress==1.0.16
 lazr.authentication==0.1.3
@@ -36,13 +35,14 @@ pyasn1==0.1.9
 pycparser==2.14
 pymacaroons==0.10.0
 python-openid==2.2.5
-raven==6.0.0
+raven==6.10.0
 requests==2.10.0
 requests-oauthlib==0.4.2
 saml2idp==0.18
 six==1.10.0
 ssoclient==2.1.1
 statsd==3.1
+talisker[django,gunicorn,raven]==0.18.0
 testresources==0.2.7
 timeline==0.0.4
 timeline-django==0.0.5
diff --git a/src/identityprovider/wsgi.py b/src/identityprovider/wsgi.py
index b8ce74c..492858c 100644
--- a/src/identityprovider/wsgi.py
+++ b/src/identityprovider/wsgi.py
@@ -2,8 +2,6 @@ import uuid
 
 import oops_wsgi
 
-from canonical_raven.middleware import Sentry
-
 from django.conf import settings
 from oops_wsgi import django as oops_wsgi_django
 from timeline.wsgi import make_app as timeline_wsgi_make_app
@@ -77,6 +75,4 @@ def make_app():
     app = oops_wsgi.make_app(
         app, config, oops_on_status=['500'],
         soft_start_timeout=settings.HANDLER_TIMEOUT_MILLIS)
-    if settings.USE_SENTRY:
-        app = Sentry(app, soft_start_timeout=settings.HANDLER_TIMEOUT_MILLIS)
     return app