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.

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

Jump to bottom

Return consistent ScopeShim objects #922

Merged
merged 10 commits into from
Aug 5, 2020
Merged

Return consistent ScopeShim objects #922

merged 10 commits into from
Aug 5, 2020

Conversation

ocelotl
Copy link
Contributor

@ocelotl ocelotl commented Jul 17, 2020 •
edited
Loading

Fixes #242

@ocelotl ocelotl requested a review from a team July 17, 2020 07:48
@ocelotl ocelotl marked this pull request as draft July 17, 2020 07:49
@ocelotl ocelotl changed the title Issue 242 Return consistent ScopeShim objects Jul 17, 2020
@ocelotl ocelotl marked this pull request as ready for review July 17, 2020 16:24
@ocelotl ocelotl self-assigned this Jul 17, 2020
@ocelotl ocelotl requested a review from codeboten July 17, 2020 16:25
@ocelotl ocelotl force-pushed the issue_242 branch 4 times, most recently from cc27ff2 to 105b78c Compare July 22, 2020 00:12
@ocelotl ocelotl added ext shim OpenTracing or OpenCensus compatibility labels Jul 22, 2020
codeboten
codeboten suggested changes Jul 29, 2020
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of questions, otherwise it looks good.

ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/__init__.py Outdated Show resolved Hide resolved
ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py Outdated Show resolved Hide resolved
codeboten
codeboten approved these changes Jul 31, 2020
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing my comments.

@ocelotl ocelotl mentioned this pull request Jul 31, 2020
Merged
ocelotl added 8 commits August 5, 2020 11:04
@ocelotl
Implement get_attribute and set_attribute
b289cd9 
Fixes open-telemetry#239
@ocelotl
Revert "Implement get_attribute and set_attribute"
3bf3551 
This reverts commit de34172.
@ocelotl
Use Correlations API
2cf8655
@ocelotl
Fix lint
3748270
@ocelotl
Store ScopeShim in context
da38ef0 
This uses the OpenTelemetry context management mechanism to store a
ScopeShim object in order to make active return the same object as the
one returned by start_active_span.

WIP: there is one failing test case, apparently the context does not get
cleared before running every test case. This seems related to the order
in which test cases are being run.
@ocelotl
Add remaining fixes
9830888 
Fixes open-telemetry#242
@ocelotl
Fix lint
39316e4
@ocelotl
Calling detach at the right place
ca29298
@codeboten codeboten merged commit 8b1da35 into open-telemetry:master Aug 5, 2020
srikanthccv pushed a commit to srikanthccv/opentelemetry-python that referenced this pull request Nov 1, 2020
@mayurkale22
chore: 0.6.0 release proposal (open-telemetry#922)
5ea46eb 
* chore: 0.6.0 release proposal

* chore: update getting-started version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzchen lzchen lzchen approved these changes

@codeboten codeboten codeboten approved these changes

Assignees

@ocelotl ocelotl

Labels
shim OpenTracing or OpenCensus compatibility
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Consistently return ScopeShim and SpanShim objects in the OT shim
3 participants
@ocelotl @codeboten @lzchen