Skip to content

Add team_name tags to Edge worker metrics#69149

Merged
ferruzzi merged 2 commits into
apache:mainfrom
shivaam:codex/edge-worker-metrics-68996
Jul 10, 2026
Merged

Add team_name tags to Edge worker metrics#69149
ferruzzi merged 2 commits into
apache:mainfrom
shivaam:codex/edge-worker-metrics-68996

Conversation

@shivaam

@shivaam shivaam commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Add the team_name tag to Edge worker metrics for multi-team deployments.

This follows the same pattern as the merged core metric PRs and #69005:

  • use prune_dict so global/no-team workers keep the existing tag set
  • keep legacy metric names unchanged
  • cover both team-scoped and no-team paths in unit tests

This PR covers the Edge worker metrics from #68996:

  • edge_worker.heartbeat_count
  • edge_worker.status
  • edge_worker.connected
  • edge_worker.maintenance
  • edge_worker.jobs_active
  • edge_worker.concurrency
  • edge_worker.free_concurrency
  • edge_worker.num_queues
  • numeric edge_worker.<sysinfo_key> gauges
  • edge_worker.ti.start
  • edge_worker.ti.finish

It also passes the worker team_name through the Edge executor orphan/liveness paths so worker reset and orphaned task-finish metrics keep the correct team attribution.

Notes:

Tests:

  • uv run ruff format --check providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py providers/edge3/src/airflow/providers/edge3/models/edge_worker.py providers/edge3/src/airflow/providers/edge3/worker_api/routes/jobs.py providers/edge3/src/airflow/providers/edge3/worker_api/routes/worker.py providers/edge3/tests/unit/edge3/executors/test_edge_executor.py providers/edge3/tests/unit/edge3/worker_api/routes/test_jobs.py providers/edge3/tests/unit/edge3/worker_api/routes/test_worker.py
  • uv run ruff check providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py providers/edge3/src/airflow/providers/edge3/models/edge_worker.py providers/edge3/src/airflow/providers/edge3/worker_api/routes/jobs.py providers/edge3/src/airflow/providers/edge3/worker_api/routes/worker.py providers/edge3/tests/unit/edge3/executors/test_edge_executor.py providers/edge3/tests/unit/edge3/worker_api/routes/test_jobs.py providers/edge3/tests/unit/edge3/worker_api/routes/test_worker.py
  • git diff --check
  • breeze run pytest providers/edge3/tests/unit/edge3/executors/test_edge_executor.py providers/edge3/tests/unit/edge3/worker_api/routes/test_jobs.py providers/edge3/tests/unit/edge3/worker_api/routes/test_worker.py -q
  • uvx prek run --from-ref upstream/main --stage pre-commit
  • breeze ci selective-check --commit-ref HEAD

Related: #68996


Was generative AI tooling used to co-author this PR?
  • Yes - OpenAI Codex

Generated-by: OpenAI Codex following the guidelines


Drafted-by: OpenAI Codex (no human review before posting)

@boring-cyborg boring-cyborg Bot added area:providers provider:edge Edge Executor / Worker (AIP-69) / edge3 labels Jun 30, 2026
@shivaam
shivaam force-pushed the codex/edge-worker-metrics-68996 branch from f9bd113 to e90f53c Compare June 30, 2026 13:35
@shivaam
shivaam force-pushed the codex/edge-worker-metrics-68996 branch from e90f53c to 74f42fc Compare June 30, 2026 14:05

@SameerMesiah97 SameerMesiah97 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Could not find any issues.

@potiuk potiuk added the ready for maintainer review Set after triaging when all criteria pass. label Jul 2, 2026
@shivaam

shivaam commented Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

@ferruzzi This Pr is waiting for your review not sure if you got a notification.

@ferruzzi ferruzzi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and follows the patterns established int he other related PRs. Wouldn't mind @jscheffl having eyes on it, and that (potential?) bug can definitely be handled in its own PR. Thanks.

@ferruzzi
ferruzzi merged commit 39ab600 into apache:main Jul 10, 2026
79 checks passed
joshuabvarghese pushed a commit to joshuabvarghese/airflow that referenced this pull request Jul 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providers provider:edge Edge Executor / Worker (AIP-69) / edge3 ready for maintainer review Set after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants