sentry fixups (#23249)

* set env

* do init in same place

* no sentry for forks

* start session

* start session

* remove that

* val
old-commit-hash: b63bc89bc993648ec5cbe2b90b896ddae90077ed
This commit is contained in:
Adeeb Shihadeh
2022-01-14 15:25:16 -08:00
committed by GitHub
parent 58a47e25bb
commit fa8ba3617b
7 changed files with 88 additions and 69 deletions
+5 -9
View File
@@ -8,7 +8,7 @@ import traceback
from typing import List, Tuple, Union
import cereal.messaging as messaging
import selfdrive.crash as crash
import selfdrive.sentry as sentry
from common.basedir import BASEDIR
from common.params import Params, ParamKeyType
from common.text_window import TextWindow
@@ -20,7 +20,7 @@ from selfdrive.manager.process_config import managed_processes
from selfdrive.athena.registration import register, UNREGISTERED_DONGLE_ID
from selfdrive.swaglog import cloudlog, add_file_handler
from selfdrive.version import is_dirty, get_commit, get_version, get_origin, get_short_branch, \
terms_version, training_version, is_comma_remote
terms_version, training_version
sys.path.append(os.path.join(BASEDIR, "pyextra"))
@@ -90,15 +90,11 @@ def manager_init() -> None:
if not is_dirty():
os.environ['CLEAN'] = '1'
# init logging
sentry.init(sentry.SentryProject.SELFDRIVE)
cloudlog.bind_global(dongle_id=dongle_id, version=get_version(), dirty=is_dirty(),
device=HARDWARE.get_device_type())
if is_comma_remote() and not (os.getenv("NOLOG") or os.getenv("NOCRASH") or PC):
crash.init()
crash.bind_user(id=dongle_id)
crash.bind_extra(dirty=is_dirty(), origin=get_origin(), branch=get_short_branch(), commit=get_commit(),
device=HARDWARE.get_device_type())
def manager_prepare() -> None:
for p in managed_processes.values():
@@ -195,7 +191,7 @@ def main() -> None:
manager_thread()
except Exception:
traceback.print_exc()
crash.capture_exception()
sentry.capture_exception()
finally:
manager_cleanup()