Skip to content
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
27 changes: 27 additions & 0 deletions py/tests/test_fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,33 @@ def test_main(self, mock_time: Mock, mock_query_dd: Mock) -> None:
msg2 = self.broker.consume(Partition(self.topic, 0), 1)
assert msg2 is None

@patch("usageaccountant.datadog_fetcher.query_datadog")
@patch("time.time")
def test_main_series_missing_unit_key(
self, mock_time: Mock, mock_query_dd: Mock
) -> None:
"""
Datadog can omit the "unit" key from a series entirely. With a
configured unit, main() should still record the data.
"""
self.good_response["series"][0].pop("unit") # type: ignore
mock_query_dd.return_value = self.good_response
mock_time.return_value = 1

ddf.main(
query_file=StringIO(self.query_str),
start_time=1,
period_seconds=2,
usage_accumulator=self.usage_accumulator,
dry_run=False,
)

msg1 = self.broker.consume(Partition(self.topic, 0), 0)
assert msg1 is not None

msg2 = self.broker.consume(Partition(self.topic, 0), 1)
assert msg2 is None

@patch("usageaccountant.datadog_fetcher.query_datadog")
@patch("time.time")
def test_main_no_unit(self, mock_time: Mock, mock_query_dd: Mock) -> None:
Expand Down
2 changes: 1 addition & 1 deletion py/usageaccountant/datadog_fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def warn_multiple_units(series_list: Sequence[DatadogResponseSeries]) -> None:
if not series_list:
return

unit_list = series_list[0]["unit"]
unit_list = series_list[0].get("unit")
if unit_list and unit_list[1] is not None:
logger.warning(f"Received multiple units from Datadog: {unit_list}.")

Expand Down
Loading