Merge pull request #51 from arokem/popylar

Remove sentry tracking and add popylar tracking.

Author: oesteban

Makefile

@@ -87,7 +87,7 @@ dist: clean ## builds source and wheel package
 install: clean ## install the package to the active Python's site-packages
 	python setup.py install
 
-docker: docker
+docker:
 	docker build --rm -t nipreps/dmriprep:latest \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \

dmriprep/__about__.py

@@ -14,3 +14,5 @@
 DOWNLOAD_URL = (
     'https://github.com/nipreps/{name}/archive/{ver}.tar.gz'.format(
         name=__packagename__, ver=__version__))
+
+__ga_id__ = "UA-156165436-1"

dmriprep/cli/run.py

@@ -214,6 +214,7 @@ def main():
     from nipype import logging as nlogging
     from multiprocessing import set_start_method, Process, Manager
     from ..utils.bids import write_derivative_description, validate_input_dir
+    from ..__about__ import __ga_id__
     set_start_method('forkserver')
     warnings.showwarning = _warn_redirect
     opts = get_parser().parse_args()
@@ -229,11 +230,9 @@ def main():
             if os.getenv('DOCKER_VERSION_8395080871'):
                 exec_env = 'dmriprep-docker'
 
-    sentry_sdk = None
     if not opts.notrack:
-        import sentry_sdk
-        from ..utils.sentry import sentry_setup
-        sentry_setup(opts, exec_env)
+        import popylar
+        popylar.track_event(__ga_id__, 'run', 'cli_run')
 
     # Validate inputs
     if not opts.skip_bids_validation:
@@ -301,27 +300,14 @@ def main():
     # Clean up master process before running workflow, which may create forks
     gc.collect()
 
-    # Sentry tracking
-    if not opts.notrack:
-        from ..utils.sentry import start_ping
-        start_ping(run_uuid, len(subject_list))
-
     errno = 1  # Default is error exit unless otherwise set
     try:
         dmriprep_wf.run(**plugin_settings)
     except Exception as e:
         if not opts.notrack:
-            from ..utils.sentry import process_crashfile
-            crashfolders = [output_dir / 'dmriprep' / 'sub-{}'.format(s) / 'log' / run_uuid
-                            for s in subject_list]
-            for crashfolder in crashfolders:
-                for crashfile in crashfolder.glob('crash*.*'):
-                    process_crashfile(crashfile)
-
-            if "Workflow did not execute cleanly" not in str(e):
-                sentry_sdk.capture_exception(e)
+            popylar.track_event(__ga_id__, 'run', 'cli_error')
         logger.critical('dMRIPrep failed: %s', e)
-        raise
+        raise e
     else:
         if opts.run_reconall:
             from templateflow import api
@@ -334,8 +320,8 @@ def main():
         errno = 0
         logger.log(25, 'dMRIPrep finished without errors')
         if not opts.notrack:
-            sentry_sdk.capture_message('dMRIPrep finished without errors',
-                                       level='info')
+            popylar.track_event(__ga_id__, 'run', 'cli_finished')
+
     finally:
         from niworkflows.reports import generate_reports
         from subprocess import check_call, CalledProcessError, TimeoutExpired
@@ -389,10 +375,6 @@ def main():
             packagename='dmriprep')
         write_derivative_description(bids_dir, output_dir / 'dmriprep')
 
-        if failed_reports and not opts.notrack:
-            sentry_sdk.capture_message(
-                'Report generation failed for %d subjects' % failed_reports,
-                level='error')
         sys.exit(int((errno + failed_reports) > 0))
 
 

setup.cfg

@@ -57,7 +57,7 @@ docs =
     %(doc)s
 duecredit = duecredit
 resmon = psutil >=5.4
-sentry = sentry-sdk >=0.6.9
+popylar = popylar >= 0.2
 style =
     flake8 >= 3.7.0
 test =
@@ -72,7 +72,7 @@ all =
     %(doc)s
     %(duecredit)s
     %(resmon)s
-    %(sentry)s
+    %(popylar)s
     %(tests)s
 
 [options.package_data]