23tae opened a new pull request, #68293:
URL: https://github.com/apache/airflow/pull/68293
<!-- SPDX-License-Identifier: Apache-2.0
https://www.apache.org/licenses/LICENSE-2.0 -->
<!--
Thank you for contributing!
Please provide above a brief description of the changes made in this pull
request.
Write a good git commit message following this guide:
http://chris.beams.io/posts/git-commit/
Please make sure that your code changes are covered with tests.
And in case of new features or big changes remember to adjust the
documentation.
Feel free to ping (in general) for the review if you do not see reaction for
a few days
(72 Hours is the minimum reaction time you can expect from volunteers) - we
sometimes miss notifications.
In case of an existing issue, reference it using one of the following:
* closes: #ISSUE
* related: #ISSUE
-->
This PR resolves the Stackdriver supervisor read crash (**Bug 2** described
in #68240) by adopting `ti.id` as the primary log filter while ensuring
backward compatibility.
## Description
Following @ashb's guidance, this PR transitions the Stackdriver log filter
to use `task_instance_id` (`ti.id`). This removes the supervisor's dependency
on `logical_date`.
### Key changes
* **Write Path:** Extracted `ti_id` from the `event` dict in `processors` to
stamp the `task_instance_id` label on supervisor logs.
* **Read Path & Fallback:**
* Prevented `AttributeError` on `RuntimeTaskInstance` by safely fetching
`logical_date`.
* Generates an `OR` query: prioritizes `task_instance_id`, falling back to
`run_id` (for AF3 logs) or `logical_date` (for legacy logs).
* **Tests:** Updated `test_read_logs` to use
`spec=RuntimeTaskInstanceProtocol` in AF3+, ensuring missing attribute crashes
are caught.
**Generated Filter Example:**
```text
(labels.task_instance_id="<uuid>" OR (labels.task_id="..." AND
labels.dag_id="..." AND labels.run_id="..."))
```
## Verification Results
I have verified the changes using `prek` and `breeze`.
* **Static Checks (Prek):** Passed
* **Unit Tests (Breeze):** Passed
---
related: #68240
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR,
please
change below checkbox to `[X]` followed by the name of the tool, uncomment
the "Generated-by".
-->
- [x] Yes
Generated-by: Antigravity following [the
guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
---
* Read the **[Pull Request
Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)**
for more information. Note: commit author/co-author name and email in commits
become permanently public when merged.
* For fundamental code changes, an Airflow Improvement Proposal
([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals))
is needed.
* When adding dependency, check compliance with the [ASF 3rd Party License
Policy](https://www.apache.org/legal/resolved.html#category-x).
* For significant user-facing changes create newsfragment:
`{pr_number}.significant.rst`, in
[airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
You can add this file in a follow-up commit after the PR is created so you
know the PR number.
<!-- pr-triage-fold: triaged=2026-06-12T13:30:58Z head=dbca0b3 action=ready
-->
---
> [!NOTE]
> **✅ Ready for review** · @23tae → `@potiuk` · 2026-06-12 13:30 UTC
>
> Thanks @23tae — all checks are green and this PR is marked **ready for
maintainer review**. The ball is with the maintainers now; a maintainer will
take the next look.
>
> <sub>_Automated triage — may be imperfect._</sub>
<!-- /pr-triage-fold -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]