3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Add some extra tags to make crash reports more traceable

Browse source
This commit is contained in:
Jaime van Kessel 2019-11-22 14:04:35 +01:00
parent 6c8fddc765
commit c7649e3db1
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cura/CrashHandler.py
View file

@ -15,6 +15,7 @@ import urllib.error
from sentry_sdk.hub import Hub from sentry_sdk.hub import Hub
from sentry_sdk.utils import capture_internal_exceptions, event_from_exception from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
from sentry_sdk import configure_scope
import certifi import certifi
@ -198,6 +199,12 @@ class CrashHandler:
self.data["qt_version"] = QT_VERSION_STR self.data["qt_version"] = QT_VERSION_STR
self.data["pyqt_version"] = PYQT_VERSION_STR self.data["pyqt_version"] = PYQT_VERSION_STR
with configure_scope() as scope:
scope.set_tag("qt_version", QT_VERSION_STR)
scope.set_tag("pyqt_version", PYQT_VERSION_STR)
scope.set_tag("os", platform.system())
scope.set_tag("os_version", platform.version())
return group return group
def _getOpenGLInfo(self): def _getOpenGLInfo(self):
@ -213,7 +220,10 @@ class CrashHandler:
info += "</ul>" info += "</ul>"
self.data["opengl"] = {"version": opengl_instance.getOpenGLVersion(), "vendor": opengl_instance.getGPUVendorName(), "type": opengl_instance.getGPUType()} self.data["opengl"] = {"version": opengl_instance.getOpenGLVersion(), "vendor": opengl_instance.getGPUVendorName(), "type": opengl_instance.getGPUType()}
with configure_scope() as scope:
scope.set_tag("opengl_version", opengl_instance.getOpenGLVersion())
scope.set_tag("gpu_vendor", opengl_instance.getGPUVendorName())
scope.set_tag("gpu_type", opengl_instance.getGPUType())
return info return info
def _exceptionInfoWidget(self): def _exceptionInfoWidget(self):
@ -295,6 +305,10 @@ class CrashHandler:
"module_name": module_name, "version": module_version, "is_plugin": isPlugin} "module_name": module_name, "version": module_version, "is_plugin": isPlugin}
self.data["exception"] = exception_dict self.data["exception"] = exception_dict
with configure_scope() as scope:
scope.set_tag("is_plugin", isPlugin)
scope.set_tag("module", module_name)
return group return group
def _logInfoWidget(self): def _logInfoWidget(self):
@ -352,28 +366,9 @@ class CrashHandler:
# Before sending data, the user comments are stored # Before sending data, the user comments are stored
self.data["user_info"] = self.user_description_text_area.toPlainText() self.data["user_info"] = self.user_description_text_area.toPlainText()
# Convert data to bytes
binary_data = json.dumps(self.data).encode("utf-8")
# CURA-6698 Create an SSL context and use certifi CA certificates for verification.
context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLSv1_2)
context.load_verify_locations(cafile = certifi.where())
# Submit data
kwoptions = {"data": binary_data,
"timeout": 5,
"context": context}
Logger.log("i", "Sending crash report info to [%s]...", self.crash_url)
if not self.has_started:
print("Sending crash report info to [%s]...\n" % self.crash_url)
try: try:
hub = Hub.current hub = Hub.current
client = hub.client event, hint = event_from_exception((self.exception_type, self.value, self.traceback))
event, hint = event_from_exception((self.exception_type, self.value, self.traceback),
client_options=client.options,
mechanism={"type": "excepthook", "handled": False},
)
hub.capture_event(event, hint=hint) hub.capture_event(event, hint=hint)
hub.flush() hub.flush()
except Exception as e: # We don't want any exception to cause problems except Exception as e: # We don't want any exception to cause problems