shahar1 commented on code in PR #68293:
URL: https://github.com/apache/airflow/pull/68293#discussion_r3999836648
##########
providers/google/src/airflow/providers/google/cloud/log/stackdriver_task_handler.py:
##########
@@ -213,12 +215,14 @@ def proc(
if task_id := event.get("task_id"):
labels[LABEL_TASK_ID] = str(task_id)
if run_id := event.get("run_id"):
- labels["run_id"] = str(run_id)
+ labels[LABEL_RUN_ID] = str(run_id)
if try_number := event.get("try_number"):
labels[LABEL_TRY_NUMBER] = str(try_number)
if map_index := event.get("map_index"):
labels["map_index"] = str(map_index)
+ if ti_id := event.get("ti_id"):
+ labels[StackdriverTaskHandler.LABEL_TASK_INSTANCE_ID] =
str(ti_id)
Review Comment:
Could you please make sure this part is tested?
##########
providers/google/src/airflow/providers/google/cloud/log/stackdriver_task_handler.py:
##########
@@ -268,8 +272,24 @@ def escape_label_value(value: str) -> str:
for key, value in self.resource.labels.items():
log_filters.append(f"resource.labels.{escape_label_key(key)}={escape_label_value(value)}")
- for key, value in ti_labels.items():
-
log_filters.append(f"labels.{escape_label_key(key)}={escape_label_value(value)}")
+ ti_id_val = ti_labels.get(LABEL_TASK_INSTANCE_ID)
+ legacy_filters = [
+ f"labels.{escape_label_key(k)}={escape_label_value(v)}"
+ for k, v in ti_labels.items()
+ if k != LABEL_TASK_INSTANCE_ID
+ ]
+
+ if ti_id_val:
+ ti_id_filter = (
+
f"labels.{escape_label_key(LABEL_TASK_INSTANCE_ID)}={escape_label_value(ti_id_val)}"
+ )
+ if legacy_filters:
+ log_filters.append(f"({ti_id_filter} OR ({' AND
'.join(legacy_filters)}))")
+ else:
+ log_filters.append(ti_id_filter)
Review Comment:
How do we handle try_number in this branch?
--
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]
