From 9440c6a301cdb30871a27718afd48019de14870d Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 12 Jun 2023 11:51:04 +0200 Subject: [PATCH 1/4] don't overwrite a previously set level --- src/sentry/lang/native/processing.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sentry/lang/native/processing.py b/src/sentry/lang/native/processing.py index 49e1412ff60c..3022bbc35b55 100644 --- a/src/sentry/lang/native/processing.py +++ b/src/sentry/lang/native/processing.py @@ -195,7 +195,8 @@ def _merge_system_info(data, system_info): def _merge_full_response(data, response): data["platform"] = "native" - if response.get("crashed") is not None: + # Do not overwrite the event's level if it has been set previously + if response.get("crashed") is not None and data.get("level") is None: data["level"] = "fatal" if response["crashed"] else "info" if response.get("system_info"): From 8284d56e950928527cc43dd4cbff5eff8303a317 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Tue, 13 Jun 2023 15:09:56 +0200 Subject: [PATCH 2/4] added level to test --- tests/symbolicator/test_minidump_full.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/symbolicator/test_minidump_full.py b/tests/symbolicator/test_minidump_full.py index 5b7be9132fa0..7a998e4e94e5 100644 --- a/tests/symbolicator/test_minidump_full.py +++ b/tests/symbolicator/test_minidump_full.py @@ -82,7 +82,9 @@ def test_full_minidump(self): "upload_file_minidump": f, "some_file": ("hello.txt", BytesIO(b"Hello World!")), }, - {"sentry[logger]": "test-logger"}, + {"sentry[logger]": "test-logger", + "sentry[level]": "error", + }, ) candidates = event.data["debug_meta"]["images"][0]["candidates"] @@ -91,6 +93,7 @@ def test_full_minidump(self): insta_snapshot_native_stacktrace_data(self, event.data) assert event.data.get("logger") == "test-logger" + assert event.data.get("level") == "error" # assert event.data.get("extra") == {"foo": "bar"} attachments = sorted( From d8e372f79c6a69ffa4ada45bf969e1d13a70835e Mon Sep 17 00:00:00 2001 From: "getsantry[bot]" <66042841+getsantry[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:11:16 +0000 Subject: [PATCH 3/4] :hammer_and_wrench: apply pre-commit fixes --- tests/symbolicator/test_minidump_full.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/symbolicator/test_minidump_full.py b/tests/symbolicator/test_minidump_full.py index 7a998e4e94e5..f1ad3175f69e 100644 --- a/tests/symbolicator/test_minidump_full.py +++ b/tests/symbolicator/test_minidump_full.py @@ -82,8 +82,9 @@ def test_full_minidump(self): "upload_file_minidump": f, "some_file": ("hello.txt", BytesIO(b"Hello World!")), }, - {"sentry[logger]": "test-logger", - "sentry[level]": "error", + { + "sentry[logger]": "test-logger", + "sentry[level]": "error", }, ) From c4dd02ed423f2bc64fc55217235ca1bd0f1c4bef Mon Sep 17 00:00:00 2001 From: Stefan Jandl Date: Wed, 14 Jun 2023 17:27:07 +0200 Subject: [PATCH 4/4] Update src/sentry/lang/native/processing.py --- src/sentry/lang/native/processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/lang/native/processing.py b/src/sentry/lang/native/processing.py index 3227415f84c4..5984dd72cd68 100644 --- a/src/sentry/lang/native/processing.py +++ b/src/sentry/lang/native/processing.py @@ -195,7 +195,7 @@ def _merge_system_info(data, system_info): def _merge_full_response(data, response): data["platform"] = "native" - # Do not overwrite the event's level if it has been set previously + # Specifically for Unreal events: Do not overwrite the level as it has already been set in Relay when merging the context. if response.get("crashed") is not None and data.get("level") is None: data["level"] = "fatal" if response["crashed"] else "info"