Skip to content

fix(fetcher): Handle missing unit in Datadog query responses #81

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.

Sign up for GitHub

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

Closed
sentry-junior wants to merge 1 commit into from
Closed

fix(fetcher): Handle missing unit in Datadog query responses #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions py/tests/test_fetcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,25 @@ def test_warn_multiple_units(self) -> None:
)
assert len(cm.output) == 1

def test_warn_multiple_units_no_unit(self) -> None:
"""
Datadog omits `unit` for metrics without unit metadata.
"""
series_list = self.good_response["series"]
series_list[0].pop("unit") # type: ignore
with self.assertNoLogs("fetcher"):
ddf.warn_multiple_units(
cast(Sequence[ddf.DatadogResponseSeries], series_list)
)

def test_warn_multiple_units_single_unit(self) -> None:
series_list = self.good_response["series"]
series_list[0]["unit"] = [{"plural": "bytes"}] # type: ignore
with self.assertNoLogs("fetcher"):
ddf.warn_multiple_units(
cast(Sequence[ddf.DatadogResponseSeries], series_list)
)

def test_warn_multiple_units_empty_series(self) -> None:
"""
Test that warn_multiple_units handles empty series list gracefully.
Expand Down
5 changes: 3 additions & 2 deletions py/usageaccountant/datadog_fetcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ def warn_multiple_units(series_list: Sequence[DatadogResponseSeries]) -> None:
if not series_list:
return

unit_list = series_list[0]["unit"]
if unit_list and unit_list[1] is not None:
# Datadog omits `unit` entirely for metrics without unit metadata.
unit_list = series_list[0].get("unit")
if unit_list and len(unit_list) > 1 and unit_list[1] is not None:
logger.warning(f"Received multiple units from Datadog: {unit_list}.")


Expand Down
Loading