Skip to content

fix: adjust dag_run extraction for Airflow 3 in OL utils #50346

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
mobuchowski merged 1 commit into from
May 8, 2025
Merged

fix: adjust dag_run extraction for Airflow 3 in OL utils #50346

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
10 changes: 9 additions & 1 deletion providers/dbt/cloud/src/airflow/providers/dbt/cloud/utils/openlineage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ def _get_logical_date(task_instance):
return date


def _get_dag_run_clear_number(task_instance):
# todo: remove when min airflow version >= 3.0
if AIRFLOW_V_3_0_PLUS:
dagrun = task_instance.get_template_context()["dag_run"]
return dagrun.clear_number
return task_instance.dag_run.clear_number


@require_openlineage_version(provider_min_version="2.3.0")
def generate_openlineage_events_from_dbt_cloud_run(
operator: DbtCloudRunJobOperator | DbtCloudJobRunSensor, task_instance: TaskInstance
Expand Down Expand Up @@ -144,7 +152,7 @@ async def get_artifacts_for_steps(steps, artifacts):
root_parent_run_id = OpenLineageAdapter.build_dag_run_id(
dag_id=task_instance.dag_id,
logical_date=_get_logical_date(task_instance),
clear_number=task_instance.dag_run.clear_number,
clear_number=_get_dag_run_clear_number(task_instance),
)

parent_job = ParentRunMetadata(
Expand Down
11 changes: 9 additions & 2 deletions providers/snowflake/src/airflow/providers/snowflake/utils/openlineage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,16 @@ def _get_logical_date(task_instance):

return date

# todo: move this run_id logic into OpenLineage's listener to avoid differences

def _get_dag_run_clear_number(task_instance):
# todo: remove when min airflow version >= 3.0
if AIRFLOW_V_3_0_PLUS:
dagrun = task_instance.get_template_context()["dag_run"]
return dagrun.clear_number
return task_instance.dag_run.clear_number


# todo: move this run_id logic into OpenLineage's listener to avoid differences
def _get_ol_run_id(task_instance) -> str:
"""
Get OpenLineage run_id from TaskInstance.
Expand Down Expand Up @@ -140,7 +147,7 @@ def _get_ol_dag_run_id(task_instance) -> str:
return OpenLineageAdapter.build_dag_run_id(
dag_id=task_instance.dag_id,
logical_date=_get_logical_date(task_instance),
clear_number=task_instance.dag_run.clear_number,
clear_number=_get_dag_run_clear_number(task_instance),
)


Expand Down
5 changes: 3 additions & 2 deletions providers/snowflake/tests/unit/snowflake/utils/test_openlineage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,16 +317,17 @@ def test_emit_openlineage_events_for_snowflake_queries_with_hook(mock_now, mock_
query_ids = ["query1", "query2", "query3"]
original_query_ids = copy.deepcopy(query_ids)
logical_date = timezone.datetime(2025, 1, 1)
mock_dagrun = mock.MagicMock(logical_date=logical_date, clear_number=0)
mock_ti = mock.MagicMock(
dag_id="dag_id",
task_id="task_id",
map_index=1,
try_number=1,
logical_date=logical_date,
state=TaskInstanceState.FAILED, # This will be query default state if no metadata found
dag_run=mock.MagicMock(logical_date=logical_date, clear_number=0),
dag_run=mock_dagrun,
)
mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
mock_ti.get_template_context.return_value = {"dag_run": mock_dagrun}

fake_metadata = {
"query1": {
Expand Down
Loading