nailo2c commented on code in PR #67140:
URL: https://github.com/apache/airflow/pull/67140#discussion_r3329118295
##########
providers/google/src/airflow/providers/google/cloud/operators/cloud_run.py:
##########
@@ -421,6 +447,52 @@ def execute_complete(self, context: Context, event: dict):
)
return Job.to_dict(job)
+ def _log_container_output(self, execution_name: str) -> None:
+ """Forward Cloud Run container logs for ``execution_name`` into the
Airflow task log."""
+ log_filter = (
+ 'resource.type="cloud_run_job" '
+ f'resource.labels.job_name="{self.job_name}" '
+ f'resource.labels.location="{self.region}" '
+ f'labels."run.googleapis.com/execution_name"="{execution_name}" '
+ 'NOT logName:"cloudaudit.googleapis.com"'
+ )
+ hook = CloudRunHook(
+ gcp_conn_id=self.gcp_conn_id,
+ impersonation_chain=self.impersonation_chain,
+ )
Review Comment:
I checked the code and found `CloudRunHook` has been instantiated three
times in class `CloudRunExecuteJobOperator`.
After surveying other providers, I found using `@cached_property` can reuse
this hook perfectly. I believe the code is cleaner than before now :)
##########
providers/google/src/airflow/providers/google/cloud/operators/cloud_run.py:
##########
@@ -421,6 +447,52 @@ def execute_complete(self, context: Context, event: dict):
)
return Job.to_dict(job)
+ def _log_container_output(self, execution_name: str) -> None:
+ """Forward Cloud Run container logs for ``execution_name`` into the
Airflow task log."""
+ log_filter = (
+ 'resource.type="cloud_run_job" '
+ f'resource.labels.job_name="{self.job_name}" '
+ f'resource.labels.location="{self.region}" '
+ f'labels."run.googleapis.com/execution_name"="{execution_name}" '
+ 'NOT logName:"cloudaudit.googleapis.com"'
+ )
+ hook = CloudRunHook(
+ gcp_conn_id=self.gcp_conn_id,
+ impersonation_chain=self.impersonation_chain,
+ )
+ try:
+ client = gcp_logging.Client(
+ project=self.project_id,
+ credentials=hook.get_credentials(),
+ )
+ for entry in client.list_entries(filter_=log_filter,
order_by=gcp_logging.ASCENDING):
+ payload = entry.payload
+ if isinstance(payload, str):
+ self.log.info(payload)
+ else:
+ self.log.info("%s", payload)
Review Comment:
Sure, let me add it.
--
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]
