Skip to content
Merged
Changes from all commits
Commits
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
35 changes: 26 additions & 9 deletions airflow-core/src/airflow/jobs/scheduler_job_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,20 @@ def _process_task_event_logs(log_records: deque[Log], session: Session):
objects = (log_records.popleft() for _ in range(len(log_records)))
session.bulk_save_objects(objects=objects, preserve_order=False)

@staticmethod
def _is_metrics_enabled():
return any(
[
conf.getboolean("metrics", "statsd_datadog_enabled", fallback=False),
conf.getboolean("metrics", "statsd_on", fallback=False),
conf.getboolean("metrics", "otel_on", fallback=False),
]
)

@staticmethod
def _is_tracing_enabled():
return conf.getboolean("traces", "otel_on")

def _process_executor_events(self, executor: BaseExecutor, session: Session) -> int:
return SchedulerJobRunner.process_executor_events(
executor=executor,
Expand Down Expand Up @@ -1188,15 +1202,17 @@ def _run_scheduler_loop(self) -> None:
self._mark_backfills_complete,
)

timers.call_regular_interval(
conf.getfloat("scheduler", "pool_metrics_interval", fallback=5.0),
self._emit_pool_metrics,
)
if self._is_metrics_enabled() or self._is_tracing_enabled():
timers.call_regular_interval(
conf.getfloat("scheduler", "pool_metrics_interval", fallback=5.0),
self._emit_pool_metrics,
)

timers.call_regular_interval(
conf.getfloat("scheduler", "running_metrics_interval", fallback=30.0),
self._emit_running_ti_metrics,
)
if self._is_metrics_enabled():
timers.call_regular_interval(
conf.getfloat("scheduler", "running_metrics_interval", fallback=30.0),
self._emit_running_ti_metrics,
)

timers.call_regular_interval(
conf.getfloat("scheduler", "task_instance_heartbeat_timeout_detection_interval", fallback=10.0),
Expand Down Expand Up @@ -1240,7 +1256,8 @@ def _run_scheduler_loop(self) -> None:
)

with create_session() as session:
self._end_spans_of_externally_ended_ops(session)
if self._is_tracing_enabled():
self._end_spans_of_externally_ended_ops(session)

# This will schedule for as many executors as possible.
num_queued_tis = self._do_scheduling(session)
Expand Down
Loading