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

Account for ProxyTracerProvider #399

Merged
merged 2 commits into from
Apr 7, 2021
Merged

Account for ProxyTracerProvider #399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51cce2
Account for ProxyTracerProvider
owais Apr 3, 2021
6169d52
Merge branch 'main' into update-tests-to-account-for-proxy-tracer
owais Apr 7, 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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 1a12fa0d681e37c1fda9cb8d46212ff3bbf6b76a
CORE_REPO_SHA: 94bf80f3870bceefa72d9a61353eaf5d7dd30993

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,8 @@ def test_suppress_instrumentation(self):
def test_not_recording(self):
with mock.patch("opentelemetry.trace.INVALID_SPAN") as mock_span:
RequestsInstrumentor().uninstrument()
# original_tracer_provider returns a default tracer provider, which
# in turn will return an INVALID_SPAN, which is always not recording
RequestsInstrumentor().instrument(
tracer_provider=self.original_tracer_provider
tracer_provider=trace._DefaultTracerProvider()
)
mock_span.is_recording.return_value = False
result = self.perform_request(self.URL)
Expand Down
4 changes: 1 addition & 3 deletions instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,8 @@ def test_suppress_instrumentation(self):
def test_not_recording(self):
with mock.patch("opentelemetry.trace.INVALID_SPAN") as mock_span:
URLLibInstrumentor().uninstrument()
# original_tracer_provider returns a default tracer provider, which
# in turn will return an INVALID_SPAN, which is always not recording
URLLibInstrumentor().instrument(
tracer_provider=self.original_tracer_provider
tracer_provider=trace._DefaultTracerProvider()
)
mock_span.is_recording.return_value = False
result = self.perform_request(self.URL)
Expand Down