Skip to content

Add team_name tag to Edge executor sync metric #69005

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
eladkal merged 2 commits into from
Jun 30, 2026
Merged

Add team_name tag to Edge executor sync metric #69005

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
6c8f5b6
Add team name tag to Edge executor sync metric
shivaam Jun 25, 2026
cb85313
Address Edge executor metric test review
shivaam Jun 27, 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
3 changes: 2 additions & 1 deletion providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from airflow.providers.edge3.models.edge_worker import EdgeWorkerModel, EdgeWorkerState, reset_metrics
from airflow.providers.edge3.models.types import is_callback_execute
from airflow.utils.db import DBLocks, create_global_lock
from airflow.utils.helpers import prune_dict
from airflow.utils.session import NEW_SESSION, provide_session
from airflow.utils.state import TaskInstanceState

Expand Down Expand Up @@ -340,7 +341,7 @@ def _purge_jobs(self, session: Session) -> bool:
@provide_session
def sync(self, *, session: Session = NEW_SESSION) -> None:
"""Sync will get called periodically by the heartbeat method."""
with Stats.timer("edge_executor.sync.duration"):
with Stats.timer("edge_executor.sync.duration", tags=prune_dict({"team_name": self.team_name})):
Comment thread
ferruzzi marked this conversation as resolved.
orphaned = self._update_orphaned_jobs(session)
purged = self._purge_jobs(session)
liveness = self._check_worker_liveness(session)
Expand Down
24 changes: 24 additions & 0 deletions providers/edge3/tests/unit/edge3/executors/test_edge_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,30 @@ def test_sync_orphaned_tasks(self, mock_stats_incr):
assert jobs[0].task_id == "started_running_orphaned"
assert jobs[0].state == TaskInstanceState.REMOVED

Comment thread
shivaam marked this conversation as resolved.
@pytest.mark.skipif(not AIRFLOW_V_3_2_PLUS, reason="team_name is only available in Airflow 3.2+")
@pytest.mark.parametrize(
("team_name", "expected_tags"),
[
("team_a", {"team_name": "team_a"}),
(None, {}),
],
)
@patch(f"{Stats.__module__}.Stats.timer")
Comment thread
shivaam marked this conversation as resolved.
def test_sync_duration_metric_tags_team_name(self, mock_stats_timer, team_name, expected_tags):
executor = EdgeExecutor(team_name=team_name)

with (
mock.patch.object(executor, "_update_orphaned_jobs", return_value=False),
mock.patch.object(executor, "_purge_jobs", return_value=False),
mock.patch.object(executor, "_check_worker_liveness", return_value=False),
):
executor.sync(session=MagicMock())

mock_stats_timer.assert_called_once_with(
"edge_executor.sync.duration",
tags=expected_tags,
)

@patch("airflow.providers.edge3.executors.edge_executor.EdgeExecutor.running_state")
@patch("airflow.providers.edge3.executors.edge_executor.EdgeExecutor.success")
@patch("airflow.providers.edge3.executors.edge_executor.EdgeExecutor.fail")
Expand Down
Loading