Merge pull request #278 from mxmeinhold/rm-raven

Remove Raven

Author: mxmeinhold

conditional/__init__.py

@@ -8,7 +8,6 @@
 from flask_gzip import Gzip
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
-from raven.contrib.flask import Sentry
 
 import sentry_sdk
 from sentry_sdk.integrations.flask import FlaskIntegration
@@ -30,10 +29,10 @@
 migrate = Migrate(app, db)
 
 # Sentry setup
-sentry = Sentry(app)
 sentry_sdk.init(
     dsn=app.config['SENTRY_DSN'],
-    integrations=[FlaskIntegration(), SqlalchemyIntegration()]
+    integrations=[FlaskIntegration(), SqlalchemyIntegration()],
+    environment=app.config['SENTRY_ENV'],
 )
 
 ldap = CSHLDAP(app.config['LDAP_BIND_DN'],
@@ -190,8 +189,7 @@ def route_errors(error, user_dict=None):
     return render_template('errors.html',
                            error=error_desc,
                            error_code=code,
-                           event_id=g.sentry_event_id,
-                           public_dsn=sentry.client.get_public_dsn('https'),
+                           event_id=sentry_sdk.last_event_id(),
                            **data), int(code)
 
 

config.env.py

@@ -25,12 +25,14 @@
 LDAP_BIND_PW = env.get("CONDITIONAL_LDAP_BIND_PW", "")
 
 # Sentry config
-# Do not set the DSN for local development
+# Not required for local development, but if you set it, make sure the
+# SENTRY_ENV is 'local-development'
 SENTRY_DSN = env.get("CONDITIONAL_SENTRY_DSN", "")
 SENTRY_CONFIG = {
     'dsn': env.get("CONDITIONAL_SENTRY_LEGACY_DSN", ""),
     'release': VERSION,
 }
+SENTRY_ENV = env.get("CONDITIONAL_SENTRY_ENV", "local-development")
 
 # OIDC Config
 OIDC_ISSUER = env.get("CONDITIONAL_OIDC_ISSUER", "https://sso.csh.rit.edu/auth/realms/csh")

frontend/javascript/app.js

@@ -1,12 +1,14 @@
-// Install Raven to send errors to Sentry
-import Raven from 'raven-js';
-Raven
-    .config('https://151ecfab1a8242009012d45a19064cfd@sentry.io/133175')
-    .install();
+// Install Sentry to send errors to Sentry
+import * as Sentry from '@sentry/browser';
+Sentry.init(
+  {
+    dsn: 'https://151ecfab1a8242009012d45a19064cfd@sentry.io/133175'
+  }
+);
 
 // Capture unhandled exceptions in promises
 window.addEventListener('unhandledrejection', err => {
-  Raven.captureException(err.reason);
+  Sentry.captureException(err.reason);
 });
 
 // Load the rest of the modules

frontend/javascript/modules/errorReport.js

@@ -1,4 +1,4 @@
-import Raven from 'raven-js';
+import * as Sentry from '@sentry/browser';
 
 export default class ErrorReport {
   constructor(btn) {
@@ -8,11 +8,11 @@ export default class ErrorReport {
   }
 
   render() {
-    this.btn.addEventListener('click', () => this._invokeRavenModal());
+    this.btn.addEventListener('click', () => this._invokeSentryModal());
   }
 
-  _invokeRavenModal() {
-    Raven.showReportDialog({
+  _invokeSentryModal() {
+    Sentry.showReportDialog({
       eventId: this.eventId
     });
   }

package.json

@@ -25,6 +25,7 @@
     "demo": "gulp production"
   },
   "dependencies": {
+    "@sentry/browser": "^5.29.2",
     "bootstrap": "^3.3.6",
     "bootstrap-material-datetimepicker": "https://github.com/T00rk/bootstrap-material-datetimepicker.git#gh-pages",
     "bootstrap-sass": "^3.4.1",
@@ -89,7 +90,6 @@
     "object-assign": "4.1.0",
     "open": "0.0.5",
     "pretty-hrtime": "1.0.2",
-    "raven-js": "^3.27.2",
     "require-dir": "1.2.0",
     "sinon": "1.17.4",
     "sinon-chai": "2.8.0",

requirements.txt

@@ -18,11 +18,9 @@ MarkupSafe~=1.0
 mccabe~=0.6.1
 oic~=0.11.0
 psycopg2~=2.8.5
-pyldap~=2.4.45
 pylint~=2.6.0
 python-dateutil~=2.6.1
 python-editor~=1.0.3
-raven~=6.10.0
 sentry-sdk[flask]~=0.19.5
 six~=1.12.0
 SQLAlchemy~=1.3.22