Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ingest): clean up reporting methods #9848

Merged
merged 1 commit into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,9 @@ def get_time_window(self) -> Tuple[datetime, datetime]:
return self.config.start_time, self.config.end_time

def error(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_warning(key, reason)
log.error(f"{key} => {reason}")
# TODO: Remove this method.
# Note that this downgrades the error to a warning.
self.report.warning(key, reason)

def _should_ingest_lineage(self) -> bool:
if (
Expand Down
8 changes: 4 additions & 4 deletions metadata-ingestion/src/datahub/ingestion/source/redash.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,12 @@ def __init__(self, ctx: PipelineContext, config: RedashConfig):
)

def error(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_failure(key, reason)
log.error(f"{key} => {reason}")
# TODO: Remove this method.
self.report.failure(key, reason)

def warn(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_warning(key, reason)
log.warning(f"{key} => {reason}")
# TODO: Remove this method.
self.report.warning(key, reason)

def validate_connection(self) -> None:
test_response = self.client._get(f"{self.config.connect_uri}/api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ def get_time_window(self) -> Tuple[datetime, datetime]:
return self.config.start_time, self.config.end_time

def warn(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_warning(key, reason)
log.warning(f"{key} => {reason}")
# TODO: Remove this method.
self.report.warning(key, reason)

def _get_s3_path(self, path: str) -> str:
if self.config.s3_lineage_config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,6 @@ def test_connection(cls, config_dict: dict) -> TestConnectionReport:
)
return test_report

def warn(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_warning(key, reason[:100])
log.warning(f"{key} => {reason}")

def error(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_failure(key, reason[:100])
log.error(f"{key} => {reason}\n{traceback.format_exc()}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ def __init__(
self.state_provider = StateProviderWrapper(config.stateful_ingestion, ctx)

def warn(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_warning(key, reason)
log.warning(f"{key} => {reason}")
# TODO: Remove this method.
self.report.warning(key, reason)

def error(self, log: logging.Logger, key: str, reason: str) -> None:
self.report.report_failure(key, reason)
log.error(f"{key} => {reason}")
# TODO: Remove this method.
self.report.failure(key, reason)

def close(self) -> None:
self.state_provider.prepare_for_commit()
Expand Down
Loading