Skip to content

Added explicit NoneType return for mypy in span.duration #2193

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 2 commits into from
Mar 18, 2021
Merged

Added explicit NoneType return for mypy in span.duration #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
476bb9e
Added explicit NoneType return for mypy in span.duration
Yun-Kim Mar 18, 2021
0151635
Merge branch 'master' into span-duration-return
Yun-Kim Mar 18, 2021
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
3 changes: 2 additions & 1 deletion ddtrace/span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@ def finished(self, value):

@property
def duration(self):
# type: () -> Optional[float]
"""The span duration in seconds."""
if self.duration_ns is not None:
return self.duration_ns / 1e9
# TODO: add return None if self.duration_ns is None
return None

@duration.setter
def duration(self, value):
Expand Down
4 changes: 4 additions & 0 deletions tests/tracer/test_span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ def test_setter_casts_duration_ns_as_int(self):
assert s.duration_ns == 3200000000
assert isinstance(s.duration_ns, int)

def test_get_span_returns_none_by_default(self):
s = Span(tracer=None, name="test.span")
assert s.duration is None

def test_traceback_with_error(self):
s = Span(None, "test.span")
try:
Expand Down