Skip to content

Reuse existing ORM session when resolving OpenLineage dag_team_name #70452

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

Open
SameerMesiah97 wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −2
Open

Reuse existing ORM session when resolving OpenLineage dag_team_name #70452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dbc989
Fix OpenLineage team lookup to reuse existing ORM session
Jul 25, 2026
0763f1e
Merge branch 'main' into OpenLineage-Team-Name-Metrics-Fix
SameerMesiah97 Jul 26, 2026
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
11 changes: 10 additions & 1 deletion providers/openlineage/src/airflow/providers/openlineage/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
)
from openlineage.client.utils import RedactMixin
from openlineage.client.uuid import generate_static_uuid
from sqlalchemy.orm import object_session
from sqlalchemy.orm.exc import DetachedInstanceError

from airflow import __version__ as AIRFLOW_VERSION
Expand Down Expand Up @@ -1068,7 +1069,15 @@ def team_name(cls, dagrun: DagRun) -> str | None:
if not isinstance(bundle_name, str):
return None

return DagBundleModel.get_team_name(bundle_name)
# Reuse the existing ORM session associated with the DagRun. Creating a new
# session here (via @provide_session) can trigger an unexpected commit within
# the scheduler callback, which breaks HA lock semantics.
session = object_session(dagrun)

if session is None:
return None

return DagBundleModel.get_team_name(bundle_name=bundle_name, session=session)


class TaskInstanceInfo(InfoJsonEncodable):
Expand Down
10 changes: 9 additions & 1 deletion providers/openlineage/tests/unit/openlineage/utils/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,18 @@ def test_dag_run_version(key):

@pytest.mark.db_test
@pytest.mark.skipif(not AIRFLOW_V_3_3_PLUS, reason="multi-team requires Airflow 3.3+")
@patch("airflow.providers.openlineage.utils.utils.object_session")
@patch("airflow.models.dagbundle.DagBundleModel.get_team_name")
@patch("airflow.providers.openlineage.utils.utils.airflow_conf.getboolean", return_value=True)
def test_dag_run_team_name(
mock_getboolean,
mock_get_team_name,
mock_object_session,
):

session = MagicMock()
mock_object_session.return_value = session

dagrun_mock = MagicMock(DagRun)
dagrun_mock.dag_versions = [
MagicMock(
Expand All @@ -356,7 +361,10 @@ def test_dag_run_team_name(

assert DagRunInfo.team_name(dagrun_mock) == "team_a"

mock_get_team_name.assert_called_once_with("bundle_name")
mock_get_team_name.assert_called_once_with(
bundle_name="bundle_name",
session=session,
)


@pytest.mark.db_test
Expand Down