1 files changed, 12 insertions, 8 deletions
diff --git a/python/sandcrawler_worker.py b/python/sandcrawler_worker.py
index dd7b07f..0164943 100755
--- a/python/sandcrawler_worker.py
+++ b/python/sandcrawler_worker.py
@@ -7,9 +7,10 @@ or S3 (SeaweedFS).
 
 import argparse
 import os
+import subprocess
 import sys
 
-import raven
+import sentry_sdk
 
 from sandcrawler import *
 from sandcrawler.persist import (
@@ -18,13 +19,6 @@ from sandcrawler.persist import (
     PersistXmlDocWorker,
 )
 
-# Yep, a global. Gets DSN from `SENTRY_DSN` environment variable
-try:
-    git_sha = raven.fetch_git_sha("..")
-except Exception:
-    git_sha = None
-sentry_client = raven.Client(release=git_sha)
-
 
 def run_grobid_extract(args):
     consume_topic = "sandcrawler-{}.ungrobided-pg".format(args.env)
@@ -484,6 +478,16 @@ def main():
         parser.print_help(file=sys.stderr)
         sys.exit(-1)
 
+    # configure sentry *after* parsing args
+    try:
+        GIT_REVISION = (
+            subprocess.check_output(["git", "describe", "--always"]).strip().decode("utf-8")
+        )
+    except Exception:
+        print("failed to configure git revision", file=sys.stderr)
+        GIT_REVISION = None
+    sentry_sdk.Client(release=GIT_REVISION, environment=args.env, max_breadcrumbs=10)
+
     args.func(args)