Skip to content

Make the "Toggle Source" log display only hide source fields, not all fields #55474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashb merged 1 commit into from
Sep 10, 2025
+17 −10
Merged

Make the "Toggle Source" log display only hide source fields, not all fields #55474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions airflow-core/src/airflow/ui/src/components/renderStructuredLog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ const addLinks = (line: string) => {
return elements;
};

const sourceFields = ["logger", "chan"];

export const renderStructuredLog = ({
index,
logLevelFilters,
Expand Down Expand Up @@ -182,16 +184,21 @@ export const renderStructuredLog = ({
</chakra.span>,
);

if (showSource) {
for (const key in reStructured) {
if (Object.hasOwn(reStructured, key)) {
elements.push(
": ",
<chakra.span color={key === "logger" ? "fg.info" : undefined} key={`prop_${key}`}>
{key === "logger" ? "source" : key}={JSON.stringify(reStructured[key])}
</chakra.span>,
);
for (const key in reStructured) {
if (Object.hasOwn(reStructured, key)) {
if (!showSource && sourceFields.includes(key)) {
continue; // eslint-disable-line no-continue
}
const val = reStructured[key] as boolean | number | object | string | null;

elements.push(
" ",
<chakra.span color="fg.info" key={`prop_${key}`}>
{key === "logger" ? "source" : key}
</chakra.span>,
// Let strings, ints, etc through as is, but JSON stringify anything more complex
`=${val instanceof Object ? JSON.stringify(val) : val}`,
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/Logs.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe("Task log grouping", () => {
);

const summarySource = screen.getByTestId(
'summary-Log message source details: sources=["/home/airflow/logs/dag_id=tutorial_dag/run_id=manual__2025-02-28T05:18:54.249762+00:00/task_id=load/attempt=1.log"]',
'summary-Log message source details sources=["/home/airflow/logs/dag_id=tutorial_dag/run_id=manual__2025-02-28T05:18:54.249762+00:00/task_id=load/attempt=1.log"]',
);

expect(summarySource).toBeVisible();
Expand Down