[#31] Use sentry-sdk client

AUTHORS.txt

@@ -2,3 +2,4 @@ Mauro De Giorgi (mdgart)
 Julian Perelli (jperelli)
 Peter Bittner (bittner)
 Forest Gregg (fgregg)
+Cody Scott (siecje)

CHANGES.txt

@@ -11,3 +11,4 @@ v0.1.0, 07/25/2014 -- Fix syntax error in nginx parser (07/03/2013; released 1y
 v0.2.0, 06/10/2016 -- Add --sentryconfig option, add static code analysis (flake8, pylint) and integration tests
 v0.3.0, 07/14/2017 -- Use entry_point.console_scripts for script setup, use relative imports in script module
 v0.4.0, 11/05/2018 -- Update interface for extended message, add real tests
+v0.5.0, 04/05/2019 -- Use sentry-sdk client

Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-raven = ">=3.3.2"
+sentry-sdk = ">=0.7.9,<1.0.0"
 tailhead = ">=1.0.2"
 
 [dev-packages]

requirements.txt

@@ -1,2 +1,2 @@
-raven>=3.3.2
+sentry-sdk>=0.7.9,<1.0.0
 tailhead>=1.0.2

sentrylogs/conf/__init__.py

@@ -1,8 +0,0 @@
-"""
-Configuration of Sentry Logs
-"""
-from raven import Client
-
-from .settings import SENTRY_DSN
-
-client = Client(dsn=SENTRY_DSN)  # pylint: disable=invalid-name

sentrylogs/conf/settings.py

@@ -3,10 +3,15 @@
 """
 import os
 
+import sentry_sdk
+
+
 # absolute path to nginx error .log file
 NGINX_ERROR_PATH = os.environ.get('NGINX_ERROR_PATH',
                                   '/var/log/nginx/error.log')
 
 SENTRY_DSN = os.environ.get('SENTRY_DSN', None)
 if not SENTRY_DSN:
     raise SystemExit('No Sentry DSN found!')
+
+sentry_sdk.init(SENTRY_DSN)

sentrylogs/helpers.py

@@ -1,17 +1,13 @@
 """
 Helper functions for Sentry Logs
 """
-from .conf import client
+from sentry_sdk import capture_message, configure_scope
 
 
 def send_message(message, params, site, logger):
     """Send a message to the Sentry server"""
-    client.capture(
-        'Message',
-        message=message,
-        params=tuple(params),
-        data={
-            'site': site,
-            'logger': logger,
-        },
-    )
+    msg = message % params
+    with configure_scope() as scope:
+        scope.set_extra('site', site)
+        scope.set_extra('logger', logger)
+        capture_message(msg)

sentrylogs/parsers/nginx.py

@@ -49,7 +49,7 @@ def parse(self, line):
                        'Client: %s\n' \
                        'Host: %s\n' \
                        'Upstream: %s\n'
-        self.params = [
+        self.params = (
             date_time_message[2],
             date_time_message[0],
             date_time_message[1],
@@ -59,5 +59,5 @@ def parse(self, line):
             otherinfo.get("client", "-"),
             otherinfo.get("host", "-"),
             otherinfo.get("upstream", "-"),
-        ]
+        )
         self.site = otherinfo.get("referrer", "-")