From 8d17e7b12851656a24cf4e10262c059f60224f76 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Mon, 8 Apr 2024 14:47:32 +0200 Subject: [PATCH] For log messages, demote the msg into the value and make the type 'Log Message'. This may just be a matter of personal taste, but I've always found these messages-as-type super-confusing. I'd rather have some made up (but clear, and thanks to the whitespace unlikely-to-otherwise-exist) type "Log Message". This is also inline in what I've already done in the UI. --- issues/tests.py | 10 +++++----- sentry/eventtypes/base.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/issues/tests.py b/issues/tests.py index 051dcf0..5892c60 100644 --- a/issues/tests.py +++ b/issues/tests.py @@ -532,21 +532,21 @@ class IntegrationTest(DjangoTestCase): class GroupingUtilsTestCase(DjangoTestCase): def test_empty_data(self): - self.assertEquals(" ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({})) + self.assertEquals("Log Message: ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({})) def test_logentry_message_takes_precedence(self): - self.assertEquals("msg: ? ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({"logentry": { + self.assertEquals("Log Message: msg: ? ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({"logentry": { "message": "msg: ?", "formatted": "msg: foobar", }})) def test_logentry_with_formatted_only(self): - self.assertEquals("msg: foobar ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({"logentry": { + self.assertEquals("Log Message: msg: foobar ⋄ ⋄ DefaultEvent", get_issue_grouper_for_data({"logentry": { "formatted": "msg: foobar", }})) def test_logentry_with_transaction(self): - self.assertEquals("msg ⋄ transaction ⋄ DefaultEvent", get_issue_grouper_for_data({ + self.assertEquals("Log Message: msg ⋄ transaction ⋄ DefaultEvent", get_issue_grouper_for_data({ "logentry": { "message": "msg", }, @@ -646,6 +646,6 @@ class GroupingUtilsTestCase(DjangoTestCase): self.assertEquals("fixed string", get_issue_grouper_for_data({"fingerprint": ["fixed string"]})) def test_fingerprint_with_default(self): - self.assertEquals(" ⋄ ⋄ DefaultEvent ⋄ fixed string", get_issue_grouper_for_data({ + self.assertEquals("Log Message: ⋄ ⋄ DefaultEvent ⋄ fixed string", get_issue_grouper_for_data({ "fingerprint": ["{{ default }}", "fixed string"], })) diff --git a/sentry/eventtypes/base.py b/sentry/eventtypes/base.py index e5309c7..a3935ce 100644 --- a/sentry/eventtypes/base.py +++ b/sentry/eventtypes/base.py @@ -15,6 +15,6 @@ class DefaultEvent: ) if message: - return truncatechars(message.splitlines()[0], 100), "" + return "Log Message", truncatechars(message.splitlines()[0], 100) - return "", "" + return "Log Message", ""