This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v2-10-test by this push:
new c83e524653 Conditionally add OTEL events when processing executor
events (#43558) (#43567)
c83e524653 is described below
commit c83e5246532d1ab7540665322e1a9fdce2c132a4
Author: Jed Cunningham <[email protected]>
AuthorDate: Thu Oct 31 17:14:43 2024 -0600
Conditionally add OTEL events when processing executor events (#43558)
(#43567)
It's possible that the start/end date are null when processing an
executor event, and there is no point in adding an OTEL event in that
case.
Before this, we'd try and convert `None` to nanoseconds and blow up the
scheduler.
Note: I don't think `queued_dttm` can be empty, but figured it didn't hurt
to
guard against it just in case I've overlooked a way it can be possible.
(cherry picked from commit fe41e156084aeb139c0a28d9bfa535aae9a56b1e)
---
airflow/jobs/scheduler_job_runner.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/airflow/jobs/scheduler_job_runner.py
b/airflow/jobs/scheduler_job_runner.py
index 4f8e900df1..aa4e8d4f26 100644
--- a/airflow/jobs/scheduler_job_runner.py
+++ b/airflow/jobs/scheduler_job_runner.py
@@ -847,9 +847,12 @@ class SchedulerJobRunner(BaseJobRunner, LoggingMixin):
span.set_attribute("ququed_by_job_id", ti.queued_by_job_id)
span.set_attribute("pid", ti.pid)
if span.is_recording():
- span.add_event(name="queued",
timestamp=datetime_to_nano(ti.queued_dttm))
- span.add_event(name="started",
timestamp=datetime_to_nano(ti.start_date))
- span.add_event(name="ended",
timestamp=datetime_to_nano(ti.end_date))
+ if ti.queued_dttm:
+ span.add_event(name="queued",
timestamp=datetime_to_nano(ti.queued_dttm))
+ if ti.start_date:
+ span.add_event(name="started",
timestamp=datetime_to_nano(ti.start_date))
+ if ti.end_date:
+ span.add_event(name="ended",
timestamp=datetime_to_nano(ti.end_date))
if conf.has_option("traces", "otel_task_log_event") and
conf.getboolean(
"traces", "otel_task_log_event"
):
