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

Fix test failures involving contextvars. #96

Merged
merged 2 commits into from
Aug 21, 2019
Merged

Fix test failures involving contextvars. #96

merged 2 commits into from
Aug 21, 2019

Conversation

a-feld
Copy link
Member

@a-feld a-feld commented Aug 21, 2019

I'm not exactly sure how this happened but it looks like #86 introduced a failure on master. The failure is due to the sdk test using contextvars to attempt to initialize the tracer.

This PR removes the use of contextvars in the offending test.

@a-feld @Jamim
Update opentelemetry-sdk/tests/trace/test_trace.py
786e8ab 
Co-Authored-By: Aliaksei Urbanski <mimworkmail@gmail.com>
@reyang
Copy link
Member

reyang commented Aug 21, 2019

Thanks @a-feld! It seems to be a merge conflict.
I'll update the repo policy so we don't allow automatic merge conflict resolution.

@reyang
Copy link
Member

reyang commented Aug 21, 2019

Just enabled the highlighted option:
image

@reyang reyang merged commit cb4fc12 into open-telemetry:master Aug 21, 2019
@a-feld a-feld deleted the fix-build-failures branch August 21, 2019 01:01
This was referenced Aug 21, 2019
Merged
Merged
Merged
srikanthccv pushed a commit to srikanthccv/opentelemetry-python that referenced this pull request Nov 1, 2020
@OlivierAlbertini @mayurkale22
Update readme for opentelemetry-core (open-telemetry#113)
39ca469 
related to open-telemetry#96

Signed-off-by: Olivier Albertini <olivier.albertini@montreal.ca>
srikanthccv pushed a commit to srikanthccv/opentelemetry-python that referenced this pull request Nov 1, 2020
@vmarchaud @mayurkale22
Add readme for both scope packages open-telemetry#96 (open-telemetry#148
b59aa33 
)

* add readme for async-hooks scope manager package

* add readme for base scope manager package

* chore(readme): fix typos
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reyang reyang reyang approved these changes

@Jamim Jamim Jamim approved these changes

@carlosalberto carlosalberto carlosalberto approved these changes

@c24t c24t Awaiting requested review from c24t

@Oberon00 Oberon00 Awaiting requested review from Oberon00

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@a-feld @reyang @carlosalberto @Jamim