Skip to content

Handle datetime parameter for historical custom metrics submitted to the API #509

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

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Handle datetime parameter for historical custom metrics submitted to the API #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e96b4c1
handle datetime params
DylanLovesCoffee Aug 5, 2024
d3cf4af
test
DylanLovesCoffee Aug 5, 2024
430c0e5
bump size check
DylanLovesCoffee Aug 5, 2024
70a6872
update snapshots
DylanLovesCoffee Aug 8, 2024
8307a30
Revert "update snapshots"
DylanLovesCoffee Aug 8, 2024
8e1a3c9
Merge branch 'main' into dylan/datettime-metrics
DylanLovesCoffee Aug 8, 2024
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
2 changes: 2 additions & 0 deletions datadog_lambda/metric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ def lambda_metric(metric_name, value, timestamp=None, tags=None, force_async=Fal
timestamp_ceiling = int(
(datetime.now() - timedelta(hours=4)).timestamp()
) # 4 hours ago
if isinstance(timestamp, datetime):
timestamp = int(timestamp.timestamp())
if timestamp_ceiling > timestamp:
logger.warning(
"Timestamp %s is older than 4 hours, not submitting metric %s",
Expand Down
13 changes: 13 additions & 0 deletions tests/test_metric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ def test_lambda_metric_timestamp_with_extension(self):
"test_timestamp", 1, timestamp=timestamp, tags=[dd_lambda_layer_tag]
)

@patch("datadog_lambda.metric.should_use_extension", True)
def test_lambda_metric_datetime_with_extension(self):
patcher = patch("datadog_lambda.metric.extension_thread_stats")
self.mock_metric_extension_thread_stats = patcher.start()
self.addCleanup(patcher.stop)

delta = timedelta(hours=5)
timestamp = datetime.now() - delta

lambda_metric("test_timestamp", 1, timestamp)
self.mock_metric_lambda_stats.distribution.assert_not_called()
self.mock_metric_extension_thread_stats.distribution.assert_not_called()

@patch("datadog_lambda.metric.should_use_extension", True)
def test_lambda_metric_invalid_timestamp_with_extension(self):
patcher = patch("datadog_lambda.metric.extension_thread_stats")
Expand Down