Skip to content

Commit 20a37f9

Browse files
authored
fix(ourlogs): Make the alias for 'severity_text' be 'severity' (#90063)
This aligns the alias with the displayed column.
1 parent 05c6834 commit 20a37f9

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

src/sentry/search/eap/ourlogs/attributes.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
search_type="integer",
2929
),
3030
ResolvedAttribute(
31-
public_alias="severity_text",
31+
public_alias="severity",
3232
internal_name="sentry.severity_text",
3333
search_type="string",
3434
),
@@ -66,6 +66,12 @@
6666
secondary_alias=True,
6767
),
6868
# Deprecated
69+
ResolvedAttribute(
70+
public_alias="severity_text",
71+
internal_name="sentry.severity_text",
72+
search_type="string",
73+
secondary_alias=True,
74+
),
6975
ResolvedAttribute(
7076
public_alias="log.severity_text",
7177
internal_name="sentry.severity_text",

tests/sentry/search/eap/test_ourlogs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def test_query_with_or(self):
180180

181181
def test_query_with_or_and_brackets(self):
182182
where, having, _ = self.resolver.resolve_query(
183-
"(message:123 and severity_text:345) or (message:foo and severity_text:bar)"
183+
"(message:123 and severity_text:345) or (message:foo and severity:bar)"
184184
)
185185
assert where == TraceItemFilter(
186186
or_filter=OrFilter(

tests/snuba/api/endpoints/test_organization_trace_item_attributes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test_substring_matching_logs(self):
7878
assert "test.attribute3" in keys
7979
assert "another.attribute" in keys
8080
assert "different.attr" in keys
81-
assert "severity_text" in keys
81+
assert "severity" in keys
8282

8383
# With a prefix only match the attributes that start with "tes"
8484
response = self.do_request(query={"substring_match": "tes"})
@@ -111,7 +111,7 @@ def test_all_attributes(self):
111111
assert len(keys) >= 3
112112
assert "test.attribute1" in keys
113113
assert "test.attribute2" in keys
114-
assert "severity_text" in keys
114+
assert "severity" in keys
115115

116116
def test_body_attribute(self):
117117
logs = [
@@ -129,7 +129,7 @@ def test_body_attribute(self):
129129

130130
assert response.status_code == 200, response.content
131131
keys = {item["key"] for item in response.data}
132-
assert keys == {"severity_text", "message", "project"}
132+
assert keys == {"severity", "message", "project"}
133133

134134
def test_disallowed_attributes(self):
135135
logs = [
@@ -149,7 +149,7 @@ def test_disallowed_attributes(self):
149149

150150
assert response.status_code == 200, response.content
151151
keys = {item["key"] for item in response.data}
152-
assert keys == {"severity_text", "message", "project", "sentry.item_type2"}
152+
assert keys == {"severity", "message", "project", "sentry.item_type2"}
153153

154154

155155
class OrganizationTraceItemAttributeValuesEndpointTest(OrganizationEventsEndpointTestBase):

tests/snuba/api/endpoints/test_project_trace_item_details.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def test_simple(self):
105105
"value": str(timestamp_nanos),
106106
},
107107
{"name": "message", "type": "str", "value": "foo"},
108-
{"name": "severity_text", "type": "str", "value": "INFO"},
108+
{"name": "severity", "type": "str", "value": "INFO"},
109109
{"name": "str_attr", "type": "str", "value": "1"},
110110
{"name": "trace", "type": "str", "value": self.trace_uuid},
111111
]
@@ -186,7 +186,7 @@ def test_simple_using_logs_item_type(self):
186186
"value": str(timestamp_nanos),
187187
},
188188
{"name": "message", "type": "str", "value": "foo"},
189-
{"name": "severity_text", "type": "str", "value": "INFO"},
189+
{"name": "severity", "type": "str", "value": "INFO"},
190190
{"name": "str_attr", "type": "str", "value": "1"},
191191
{"name": "trace", "type": "str", "value": self.trace_uuid},
192192
],

0 commit comments

Comments
 (0)