Skip to content

4143 propagators none #4552

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

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion opentelemetry-api/src/opentelemetry/propagate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ def inject(

for propagator in environ_propagators.split(","):
propagator = propagator.strip()

if propagator.lower() == "none":
logger.debug(
"OTEL_PROPAGATORS environment variable contains none, removing all propagators"
)
propagators = []
break
try:
propagators.append( # type: ignore
next( # type: ignore
Expand Down
44 changes: 44 additions & 0 deletions opentelemetry-api/tests/propagators/test_propagators.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,50 @@ def test_propagators(propagators):

reload(opentelemetry.propagate)

@patch.dict(environ, {OTEL_PROPAGATORS: "None"})
@patch("opentelemetry.propagators.composite.CompositePropagator")
def test_none_propogators(self, mock_compositehttppropagator):
def test_propagators(propagators):
propagators = {propagator.__class__ for propagator in propagators}

self.assertEqual(len(propagators), 0)
self.assertEqual(
propagators,
set(),
)

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
)

# pylint: disable=import-outside-toplevel
import opentelemetry.propagate

reload(opentelemetry.propagate)

@patch.dict(environ, {OTEL_PROPAGATORS: "tracecontext, None"})
@patch("opentelemetry.propagators.composite.CompositePropagator")
def test_multiple_propogators_with_none(
self, mock_compositehttppropagator
):
def test_propagators(propagators):
propagators = {propagator.__class__ for propagator in propagators}

self.assertEqual(len(propagators), 0)
self.assertEqual(
propagators,
set(),
)

mock_compositehttppropagator.configure_mock(
**{"side_effect": test_propagators}
)

# pylint: disable=import-outside-toplevel
import opentelemetry.propagate

reload(opentelemetry.propagate)

@patch.dict(environ, {OTEL_PROPAGATORS: "a, b, c "})
@patch("opentelemetry.propagators.composite.CompositePropagator")
@patch("opentelemetry.util._importlib_metadata.entry_points")
Expand Down