Skip to content

Commit

Permalink
Raven is deprecated, switch to sentry-sdk (alerta#1056)
Browse files Browse the repository at this point in the history
* Raven is deprecated, switch to sentry-sdk

* Try form first

* Remove None param
  • Loading branch information
asherf authored and satterly committed Aug 10, 2019
1 parent 2402bc9 commit c852609
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[settings]
known_third_party = blinker,bson,click,dateutil,flask,flask_compress,flask_cors,itsdangerous,jwt,ldap,pkg_resources,psycopg2,pymongo,pyparsing,pytz,raven,requests,requests_mock,saml2,setuptools,werkzeug,yaml
known_third_party = blinker,bson,click,dateutil,flask,flask_compress,flask_cors,itsdangerous,jwt,ldap,pkg_resources,psycopg2,pymongo,pyparsing,pytz,requests,requests_mock,saml2,sentry_sdk,setuptools,werkzeug,yaml
12 changes: 7 additions & 5 deletions alerta/app.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from typing import Any, Dict

import sentry_sdk
from flask import Flask
from flask_compress import Compress
from flask_cors import CORS
from raven.contrib.flask import Sentry
from sentry_sdk.integrations.flask import FlaskIntegration
from werkzeug.contrib.fixers import ProxyFix

from alerta.database.base import Database, QueryBuilder
Expand Down Expand Up @@ -33,13 +34,15 @@

db = Database()
qb = QueryBuilder()
sentry = Sentry()
# Sentry will grab DSN from SENTRY_DSN environment variable.
sentry_sdk.init(integrations=[FlaskIntegration()])

mailer = Mailer()
plugins = Plugins()
custom_webhooks = CustomWebhooks()


def create_app(config_override: Dict[str, Any]=None, environment: str=None) -> Flask:
def create_app(config_override: Dict[str, Any] = None, environment: str = None) -> Flask:

app = Flask(__name__)
app.config['ENVIRONMENT'] = environment
Expand All @@ -63,7 +66,6 @@ def create_app(config_override: Dict[str, Any]=None, environment: str=None) -> F

db.init_db(app)
qb.init_app(app)
sentry.init_app(app)

mailer.register(app)
plugins.register(app)
Expand Down Expand Up @@ -94,7 +96,7 @@ def create_app(config_override: Dict[str, Any]=None, environment: str=None) -> F
pass


def create_celery_app(app: Flask=None) -> 'Celery':
def create_celery_app(app: Flask = None) -> 'Celery':

from alerta.utils.format import register_custom_serializer
register_custom_serializer()
Expand Down
2 changes: 1 addition & 1 deletion alerta/webhooks/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def custom(webhook):
try:
rv = custom_webhooks.webhooks[webhook].incoming(
query_string=request.args,
payload=request.get_json() or request.get_data(as_text=True) or request.form
payload=request.get_json() or request.form or request.get_data(as_text=True)
)
except Exception as e:
raise ApiError(str(e), 400)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ pyparsing==2.4.0
python-dateutil==2.8.0
pytz==2019.1
PyYAML==5.1
raven==6.10.0
requests==2.21.0
sentry-sdk[flask]===0.10.2
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def read(filename):
'Flask>=0.10.1',
'Flask-Cors>=3.0.2',
'Flask-Compress>=1.4.0',
'raven[flask]>=6.2.1',
'sentry-sdk[flask]>=0.10.2',
'pymongo>=3.0',
'pyparsing',
'requests',
Expand Down

0 comments on commit c852609

Please sign in to comment.