jscheffl commented on code in PR #63932:
URL: https://github.com/apache/airflow/pull/63932#discussion_r3126994059
##########
providers/edge3/src/airflow/providers/edge3/models/edge_worker.py:
##########
@@ -174,125 +169,21 @@ def set_metrics(
EdgeWorkerState.MAINTENANCE_EXIT,
EdgeWorkerState.OFFLINE_MAINTENANCE,
)
- additional_keys = set(sysinfo or ()) - {
- "status",
- "airflow_version",
- "edge_provider_version",
- "python_version",
- "worker_start_time",
- "concurrency",
- "free_concurrency",
- }
-
- if DualStatsManager is not None:
- try:
- DualStatsManager.gauge(
- "edge_worker.status",
- sysinfo.get("status", logging.NOTSET), # type: ignore
- tags={},
- extra_tags={"worker_name": worker_name},
- )
- except ValueError:
- logger.warning(
- "Failed to set metric edge_worker.status. Mapping is missing
in metrics_template.yaml"
- )
-
- DualStatsManager.gauge(
- "edge_worker.connected",
- int(connected),
- tags={},
- extra_tags={"worker_name": worker_name},
- )
-
- DualStatsManager.gauge(
- "edge_worker.maintenance",
- int(maintenance),
- tags={},
- extra_tags={"worker_name": worker_name},
- )
-
- DualStatsManager.gauge(
- "edge_worker.jobs_active",
- jobs_active,
- tags={},
- extra_tags={"worker_name": worker_name},
- )
-
- DualStatsManager.gauge(
- "edge_worker.concurrency",
- concurrency,
- tags={},
- extra_tags={"worker_name": worker_name},
- )
-
- DualStatsManager.gauge(
- "edge_worker.free_concurrency",
- free_concurrency,
- tags={},
- extra_tags={"worker_name": worker_name},
- )
-
- DualStatsManager.gauge(
- "edge_worker.num_queues",
- len(queues),
- tags={},
- extra_tags={"worker_name": worker_name, "queues":
",".join(queues)},
- )
-
- for key in additional_keys:
- value = sysinfo.get(key)
- if isinstance(value, (int, float)):
- try:
- DualStatsManager.gauge(
- f"edge_worker.{key}",
- value,
- tags={},
- extra_tags={"worker_name": worker_name},
- )
- except ValueError as e:
- logger.warning(
- "Failed to set metric for key %s with value %s: %s",
- key,
- value,
- e,
- )
- else:
- from airflow.providers.common.compat.sdk import Stats
-
- Stats.gauge(f"edge_worker.status.{worker_name}", sysinfo.get("status",
logging.NOTSET)) # type: ignore
- Stats.gauge(
- "edge_worker.status",
- sysinfo.get("status", logging.NOTSET), # type: ignore
- tags={"worker_name": worker_name},
- )
-
- Stats.gauge(f"edge_worker.connected.{worker_name}", int(connected))
- Stats.gauge("edge_worker.connected", int(connected),
tags={"worker_name": worker_name})
-
- Stats.gauge(f"edge_worker.maintenance.{worker_name}", int(maintenance))
- Stats.gauge("edge_worker.maintenance", int(maintenance),
tags={"worker_name": worker_name})
-
- Stats.gauge(f"edge_worker.jobs_active.{worker_name}", jobs_active)
- Stats.gauge("edge_worker.jobs_active", jobs_active,
tags={"worker_name": worker_name})
-
- Stats.gauge(f"edge_worker.concurrency.{worker_name}", concurrency)
- Stats.gauge("edge_worker.concurrency", concurrency,
tags={"worker_name": worker_name})
-
- Stats.gauge(f"edge_worker.free_concurrency.{worker_name}",
free_concurrency)
- Stats.gauge("edge_worker.free_concurrency", free_concurrency,
tags={"worker_name": worker_name})
-
- Stats.gauge(f"edge_worker.num_queues.{worker_name}", len(queues))
- Stats.gauge(
- "edge_worker.num_queues",
- len(queues),
- tags={"worker_name": worker_name, "queues": ",".join(queues)},
- )
-
- for key in additional_keys:
- value = sysinfo.get(key)
- if isinstance(value, (int, float)):
- Stats.gauge(f"edge_worker.{key}.{worker_name}", value)
- Stats.gauge(f"edge_worker.{key}", value, tags={"worker_name":
worker_name})
Review Comment:
The change is now dropping the "new feature" added three days ago that
additional custom metrics can be published.
Specific reason it is removed now? Because also documented in
https://github.com/boschglobal/airflow/blob/main/providers/edge3/docs/deployment.rst#worker-monitoring
with an example in
https://github.com/boschglobal/airflow/blob/main/providers/edge3/src/airflow/providers/edge3/cli/example_extended_sysinfo.py
--
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]
