Skip to content

[SLS-1682] Fix issue with tests failing due to strftime taking timezone into account #194

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 1 commit into from
Nov 10, 2021
Merged

[SLS-1682] Fix issue with tests failing due to strftime taking timezone into account #194

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
14 changes: 7 additions & 7 deletions datadog_lambda/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
EventTypes,
EventSubtypes,
)
from datetime import datetime
from datetime import datetime, timezone

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -547,7 +547,7 @@ def create_inferred_span_from_sns_event(event, context):
}
sns_dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
timestamp = event_record["Sns"]["Timestamp"]
request_time_epoch = datetime.strptime(timestamp, sns_dt_format)
dt = datetime.strptime(timestamp, sns_dt_format)

args = {
"resource": topic_name,
Expand All @@ -557,7 +557,7 @@ def create_inferred_span_from_sns_event(event, context):
span = tracer.trace("aws.sns", **args)
if span:
span.set_tags(tags)
span.start = int(request_time_epoch.strftime("%s"))
span.start = dt.replace(tzinfo=timezone.utc).timestamp()
return span


Expand Down Expand Up @@ -618,7 +618,7 @@ def create_inferred_span_from_s3_event(event, context):
}
dt_format = "%Y-%m-%dT%H:%M:%S.%fZ"
timestamp = event_record["eventTime"]
request_time_epoch = datetime.strptime(timestamp, dt_format)
dt = datetime.strptime(timestamp, dt_format)

args = {
"resource": bucket_name,
Expand All @@ -628,7 +628,7 @@ def create_inferred_span_from_s3_event(event, context):
span = tracer.trace("aws.s3", **args)
if span:
span.set_tags(tags)
span.start = int(request_time_epoch.strftime("%s"))
span.start = dt.replace(tzinfo=timezone.utc).timestamp()
return span


Expand All @@ -642,7 +642,7 @@ def create_inferred_span_from_eventbridge_event(event, context):
}
dt_format = "%Y-%m-%dT%H:%M:%SZ"
timestamp = event["time"]
request_time_epoch = datetime.strptime(timestamp, dt_format)
dt = datetime.strptime(timestamp, dt_format)

args = {
"resource": source,
Expand All @@ -652,7 +652,7 @@ def create_inferred_span_from_eventbridge_event(event, context):
span = tracer.trace("aws.eventbridge", **args)
if span:
span.set_tags(tags)
span.start = int(request_time_epoch.strftime("%s"))
span.start = dt.replace(tzinfo=timezone.utc).timestamp()
return span


Expand Down
9 changes: 3 additions & 6 deletions tests/test_tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,7 @@ def test_create_inferred_span_from_sns_event(self):
)
self.assertEqual(span.get_tag("request_id"), None)
self.assertEqual(span.get_tag("span_type"), "inferred")
# TODO FIXME: investigate why this is flaky
# self.assertEqual(span.start, 18000.0)
self.assertEqual(span.start, 0.0)
self.assertEqual(span.span_type, "web")

def test_create_inferred_span_from_kinesis_event(self):
Expand Down Expand Up @@ -854,8 +853,7 @@ def test_create_inferred_span_from_s3_event(self):
)
self.assertEqual(span.get_tag("request_id"), None)
self.assertEqual(span.get_tag("span_type"), "inferred")
# TODO FIXME: investigate why this is flaky
# self.assertEqual(span.start, 18000.0)
self.assertEqual(span.start, 0.0)
self.assertEqual(span.span_type, "web")

def test_create_inferred_span_from_eventbridge_event(self):
Expand Down Expand Up @@ -883,6 +881,5 @@ def test_create_inferred_span_from_eventbridge_event(self):
)
self.assertEqual(span.get_tag("request_id"), None)
self.assertEqual(span.get_tag("span_type"), "inferred")
# TODO FIXME: investigate why this is flaky
# self.assertEqual(span.start, 1636004265.0)
self.assertEqual(span.start, 1635989865.0)
self.assertEqual(span.span_type, "web")