Skip to content

Commit 9613f77

Browse files
authored
chore(ourlogs): Ensure frontend aliases are things that actually work (#90064)
- severity_text -> severity rename for consistency - do not include organization.id in possible searchable tags - do not include project.id as a searchable tag (it should be done with project selector) - do not include item_type as a searchable tag - do not include timestamp as a string tag (it's impossible to use it this way, users can filter timestamps via the graph)
1 parent 1bd8c6b commit 9613f77

File tree

8 files changed

+12
-16
lines changed

8 files changed

+12
-16
lines changed

static/app/views/explore/components/schemaHints/schemaHintsUtils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const COMMON_HINT_KEYS = [
2222

2323
const LOGS_HINT_KEYS = [
2424
OurLogKnownFieldKey.MESSAGE,
25-
OurLogKnownFieldKey.SEVERITY_TEXT,
25+
OurLogKnownFieldKey.SEVERITY,
2626
OurLogKnownFieldKey.SEVERITY_NUMBER,
2727
OurLogKnownFieldKey.ORGANIZATION_ID,
2828
OurLogKnownFieldKey.PROJECT_ID,

static/app/views/explore/constants.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ export const SENTRY_LOG_STRING_TAGS: string[] = [
4848
OurLogKnownFieldKey.TRACE_ID,
4949
OurLogKnownFieldKey.ID,
5050
OurLogKnownFieldKey.MESSAGE,
51-
OurLogKnownFieldKey.SEVERITY_TEXT,
52-
OurLogKnownFieldKey.ORGANIZATION_ID,
53-
OurLogKnownFieldKey.PROJECT_ID,
54-
OurLogKnownFieldKey.TIMESTAMP,
55-
OurLogKnownFieldKey.ITEM_TYPE,
51+
OurLogKnownFieldKey.SEVERITY,
5652
];
5753

5854
export const SENTRY_LOG_NUMBER_TAGS: string[] = [OurLogKnownFieldKey.SEVERITY_NUMBER];

static/app/views/explore/logs/constants.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {type OurLogFieldKey, OurLogKnownFieldKey} from 'sentry/views/explore/log
88

99
export const LogAttributesHumanLabel: Partial<Record<OurLogFieldKey, string>> = {
1010
[OurLogKnownFieldKey.TIMESTAMP]: t('Timestamp'),
11-
[OurLogKnownFieldKey.SEVERITY_TEXT]: t('Severity'),
11+
[OurLogKnownFieldKey.SEVERITY]: t('Severity'),
1212
[OurLogKnownFieldKey.MESSAGE]: t('Message'),
1313
[OurLogKnownFieldKey.TRACE_ID]: t('Trace'),
1414
};
@@ -21,7 +21,7 @@ export const AlwaysPresentLogFields: OurLogFieldKey[] = [
2121
OurLogKnownFieldKey.PROJECT_ID,
2222
OurLogKnownFieldKey.TRACE_ID,
2323
OurLogKnownFieldKey.SEVERITY_NUMBER,
24-
OurLogKnownFieldKey.SEVERITY_TEXT,
24+
OurLogKnownFieldKey.SEVERITY,
2525
OurLogKnownFieldKey.TIMESTAMP,
2626
];
2727

static/app/views/explore/logs/fieldRenderers.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export function SeverityCircleRenderer(props: Omit<LogFieldRendererProps, 'item'
9494
if (!props.tableResultLogRow) {
9595
return null;
9696
}
97-
const attribute_value = props.tableResultLogRow?.[OurLogKnownFieldKey.SEVERITY_TEXT];
97+
const attribute_value = props.tableResultLogRow?.[OurLogKnownFieldKey.SEVERITY];
9898
const _severityNumber = props.tableResultLogRow?.[OurLogKnownFieldKey.SEVERITY_NUMBER];
9999

100100
const severityNumber = _severityNumber ? Number(_severityNumber) : null;
@@ -193,7 +193,7 @@ export const LogAttributesRendererMap: Record<
193193
[OurLogKnownFieldKey.TIMESTAMP]: props => {
194194
return TimestampRenderer(props);
195195
},
196-
[OurLogKnownFieldKey.SEVERITY_TEXT]: SeverityTextRenderer,
196+
[OurLogKnownFieldKey.SEVERITY]: SeverityTextRenderer,
197197
[OurLogKnownFieldKey.MESSAGE]: LogBodyRenderer,
198198
[OurLogKnownFieldKey.TRACE_ID]: TraceIDRenderer,
199199
};

static/app/views/explore/logs/logFieldsTree.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('logFieldsTree', () => {
7979
[OurLogKnownFieldKey.ORGANIZATION_ID]: 1,
8080
[OurLogKnownFieldKey.MESSAGE]: 'test log body',
8181
[OurLogKnownFieldKey.SEVERITY_NUMBER]: 456,
82-
[OurLogKnownFieldKey.SEVERITY_TEXT]: 'error',
82+
[OurLogKnownFieldKey.SEVERITY]: 'error',
8383
[OurLogKnownFieldKey.TIMESTAMP]: '2025-04-03T15:50:10+00:00',
8484
}}
8585
/>

static/app/views/explore/logs/logsTableRow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function LogRowContent({
106106
const theme = useTheme();
107107

108108
const severityNumber = dataRow[OurLogKnownFieldKey.SEVERITY_NUMBER];
109-
const severityText = dataRow[OurLogKnownFieldKey.SEVERITY_TEXT];
109+
const severityText = dataRow[OurLogKnownFieldKey.SEVERITY];
110110

111111
const level = getLogSeverityLevel(
112112
typeof severityNumber === 'number' ? severityNumber : null,
@@ -225,7 +225,7 @@ function LogRowDetails({
225225
const organization = useOrganization();
226226
const fields = useLogsFields();
227227
const severityNumber = dataRow[OurLogKnownFieldKey.SEVERITY_NUMBER];
228-
const severityText = dataRow[OurLogKnownFieldKey.SEVERITY_TEXT];
228+
const severityText = dataRow[OurLogKnownFieldKey.SEVERITY];
229229

230230
const level = getLogSeverityLevel(
231231
typeof severityNumber === 'number' ? severityNumber : null,

static/app/views/explore/logs/types.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export enum OurLogKnownFieldKey {
1717
ID = 'sentry.item_id',
1818
MESSAGE = 'message',
1919
SEVERITY_NUMBER = 'severity_number',
20-
SEVERITY_TEXT = 'severity_text',
20+
SEVERITY = 'severity',
2121
ORGANIZATION_ID = 'organization.id',
2222
PROJECT_ID = 'project.id',
2323
PROJECT = 'project',
@@ -33,7 +33,7 @@ export type OurLogFieldKey = OurLogCustomFieldKey | OurLogKnownFieldKey;
3333
type OurLogsKnownFieldResponseMap = {
3434
[OurLogKnownFieldKey.MESSAGE]: string;
3535
[OurLogKnownFieldKey.SEVERITY_NUMBER]: number;
36-
[OurLogKnownFieldKey.SEVERITY_TEXT]: string;
36+
[OurLogKnownFieldKey.SEVERITY]: string;
3737
[OurLogKnownFieldKey.ORGANIZATION_ID]: number;
3838
[OurLogKnownFieldKey.PROJECT_ID]: number;
3939
[OurLogKnownFieldKey.TIMESTAMP]: string;

static/app/views/performance/newTraceDetails/traceHeader/title.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function getTitle(event: TraceTree.TraceEvent | OurLogsResponseItem | null): {
3535
}
3636

3737
// Handle log events
38-
if (OurLogKnownFieldKey.SEVERITY_TEXT in event) {
38+
if (OurLogKnownFieldKey.SEVERITY in event) {
3939
return {
4040
title: t('Trace'),
4141
subtitle: event[OurLogKnownFieldKey.MESSAGE],

0 commit comments

Comments
 (0)