sentry-sdk provides a link to sentry.io, a service which monitors applications deployed in the wild. Defaults to true. Best to just remove the option. diff --git a/dbxfs/main.py b/dbxfs/main.py index 458e82a..784dd2a 100755 --- a/dbxfs/main.py +++ b/dbxfs/main.py @@ -43,8 +43,6 @@ import userspacefs import keyring from keyring.errors import KeyringError -import sentry_sdk - from block_tracing import block_tracing from dbxfs.dbxfs import FileSystem as DropboxFileSystem @@ -127,16 +125,6 @@ def on_new_process(proc_args): level = [logging.WARNING, logging.INFO, logging.DEBUG][min(2, verbose)] logging.basicConfig(level=level, handlers=[logging_stream], format=format_) - if int(proc_args.get('send_error_reports', '0')): - version = proc_args['version'] - try: - sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", - release='%s@%s' % (APP_NAME, version), - with_locals=False) - sentry_sdk.set_user(dict(id=proc_args['sentry_user'])) - except Exception: - log.warning("Failed to initialize sentry", exc_info=True) - def create_fs(fs_args): refresh_token = fs_args.get('refresh_token') access_token = fs_args.get('access_token') @@ -527,10 +515,6 @@ deprecated, this functionality will be removed in the future. config['asked_send_error_reports'] = True save_config = True - if config.get("send_error_reports", False) and not isinstance(config.get("sentry_user", None), str): - config['sentry_user'] = uuid.uuid4().hex - save_config = True - if save_refresh_token and yes_no_input("Do you want \"%s\" to be the default mount point?" % (mount_point,), default_yes=True): config['mount_point'] = mount_point save_config = True @@ -541,15 +525,6 @@ deprecated, this functionality will be removed in the future. log.info("Starting %s...", APP_NAME) - if config.get('send_error_reports', False): - try: - sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", - release='%s@%s' % (APP_NAME, version), - with_locals=False) - sentry_sdk.set_user(dict(id=config['sentry_user'])) - except Exception: - log.warning("Failed to initialize sentry", exc_info=True) - if cache_folder is None: cache_folder = os.path.join(appdirs.user_cache_dir(APP_NAME), "file_cache") try: @@ -602,8 +577,6 @@ deprecated, this functionality will be removed in the future. proc_args['verbose'] = str(args.verbose) proc_args['version'] = version proc_args['send_error_reports'] = str(int(config.get('send_error_reports', False))) - if config.get('send_error_reports', False): - proc_args['sentry_user'] = config['sentry_user'] return userspacefs.simple_main(mount_point, display_name, ('dbxfs.main.create_fs', fs_args), diff --git a/setup.py b/setup.py index ae696e9..869d0db 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,6 @@ setup( "privy>=6.0,<7", "keyring>=15.1.0", "keyrings.alt>=3.1,<5", - "sentry_sdk>=1.0,<2", ], extras_require={ 'safefs': ["safefs"], bordeaux compared to ci. It also has IPv6 support. Additionally, bordeaux generally had more substitutes than ci, particularly for aarch64-linux and armhf-linux. This change will offer a very slight speedup for those substitutes that only bordeaux has. Bordeaux has been a default substitute server for nearly 3 years now and I think this change is overdue. I'm also hopeful that we'll be able to build on the testing regarding mirrors for bordeaux, and that'll allow potentially improving the hosting setup (through providing more redundancy) and further improving substitute fetching for users who currently have issues with substitute access. * config-daemon.ac: Switch substitute urls order. * doc/guix.texi: Ditto. * etc/guix-install.sh: Ditto. * gnu/installer/newt/network.scm (wait-service-online): Ditto. * guix/store.scm (%default-substitute-urls): Ditto. Change-Id: I4f6d93ae1fc8b03d80b47b18b5749a51f1fde17b Signed-off-by: Christopher Baines <mail@cbaines.net> Christopher Baines