Skip to content
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.

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

Add setStatus in Span #213

Merged
merged 37 commits into from
Oct 16, 2019
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b837c9f
Span add override parameters
hectorhdzg Sep 26, 2019
a12fe5d
Make lint happy
hectorhdzg Sep 26, 2019
276ecb4
Addressing comments
hectorhdzg Sep 27, 2019
2b90351
Addressing comments
hectorhdzg Sep 27, 2019
eccef1a
Allowing 0 as start and end time
hectorhdzg Sep 28, 2019
a187fec
Fix lint issues
hectorhdzg Sep 28, 2019
a43c980
Merge remote-tracking branch 'upstream/master'
hectorhdzg Oct 2, 2019
8dfb44e
Merge remote-tracking branch 'upstream/master'
hectorhdzg Oct 8, 2019
77d3649
Add code coverage
hectorhdzg Oct 8, 2019
f3af20f
Revert latest commit
hectorhdzg Oct 9, 2019
1229bc7
Merge remote-tracking branch 'upstream/master'
hectorhdzg Oct 9, 2019
e54a053
Adding setStatus in Span
hectorhdzg Oct 9, 2019
174ac90
Fixing lint issues
hectorhdzg Oct 9, 2019
2015944
Addressing comments
hectorhdzg Oct 10, 2019
437b5a5
Fixing mypy issues
hectorhdzg Oct 10, 2019
8ae0532
Fixing old python ver issue
hectorhdzg Oct 10, 2019
798551b
Fixing formatting issue
hectorhdzg Oct 10, 2019
35a93d4
Fixing issue with trailing whitespace
hectorhdzg Oct 10, 2019
db45017
Addressing comments
hectorhdzg Oct 11, 2019
7fe57a1
Fixing lint issues
hectorhdzg Oct 11, 2019
57ebc24
Fixing formatting issues
hectorhdzg Oct 11, 2019
27df21b
Fixing lint issues
hectorhdzg Oct 11, 2019
4ccc142
Fixing issues generating docs
hectorhdzg Oct 12, 2019
d08c3db
Addressing comments
hectorhdzg Oct 15, 2019
5c39740
Merge branch 'master' into spanStatus
hectorhdzg Oct 15, 2019
7265b92
Fixing lint issue after merge
hectorhdzg Oct 15, 2019
98960ef
Lint fix
hectorhdzg Oct 15, 2019
a714d20
Fix tests
hectorhdzg Oct 15, 2019
ac7cf0d
Enum docstring fixes
c24t Oct 15, 2019
1863412
Docstring tweaks
c24t Oct 15, 2019
27ba6a4
Fix wrap
c24t Oct 15, 2019
5e17bb7
Merge pull request #1 from c24t/spanStatus-docs-fixes
hectorhdzg Oct 15, 2019
d8f8c26
Addressing comments
hectorhdzg Oct 15, 2019
673b5be
Merge
hectorhdzg Oct 15, 2019
c5e71eb
Addressing comments
hectorhdzg Oct 16, 2019
ce3552b
Fix mangled comment wrapping
c24t Oct 16, 2019
04709bd
Wrap some text
c24t Oct 16, 2019
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
Prev Previous commit
Next Next commit
Addressing comments
  • Loading branch information
hectorhdzg committed Sep 27, 2019
commit 2b90351052f8edb389be395a88e0fa38b606079d
10 changes: 2 additions & 8 deletions opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,7 @@ def start(self, start_time: int = None):
return
has_started = self.start_time is not None
if not has_started:
if start_time is not None:
self.start_time = start_time
else:
self.start_time = util.time_ns()
self.start_time = start_time or util.time_ns()
if has_started:
logger.warning("Calling start() on a started span.")
return
Expand All @@ -363,10 +360,7 @@ def end(self, end_time: int = None):
raise RuntimeError("Calling end() on a not started span.")
has_ended = self.end_time is not None
if not has_ended:
if end_time is not None:
self.end_time = end_time
else:
self.end_time = util.time_ns()
self.end_time = end_time or util.time_ns()
if has_ended:
logger.warning("Calling end() on an ended span.")
return
Expand Down