Skip to content

Commit b07670f

Browse files
committed
removed redundant code
1 parent 41b0350 commit b07670f

File tree

2 files changed

+20
-25
lines changed

2 files changed

+20
-25
lines changed

opentelemetry-api/src/opentelemetry/propagate/__init__.py

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -132,30 +132,31 @@ def inject(
132132
if environ_propagators.lower() == "none":
133133
propagators = []
134134
else:
135-
for propagator in environ_propagators.split(","):
136-
propagator = propagator.strip()
135+
propagators = environ_propagators.split(",")
137136

138-
try:
137+
for propagator in environ_propagators.split(","):
138+
propagator = propagator.strip()
139139

140-
propagators.append( # type: ignore
141-
next( # type: ignore
142-
iter( # type: ignore
143-
entry_points( # type: ignore
144-
group="opentelemetry_propagator",
145-
name=propagator,
146-
)
140+
try:
147141

142+
propagators.append( # type: ignore
143+
next( # type: ignore
144+
iter( # type: ignore
145+
entry_points( # type: ignore
146+
group="opentelemetry_propagator",
147+
name=propagator,
148148

149149
)
150-
).load()()
151-
)
152-
except StopIteration:
153-
raise ValueError(
154-
f"Propagator {propagator} not found. It is either misspelled or not installed."
155-
)
156-
except Exception: # pylint: disable=broad-exception-caught
157-
logger.exception("Failed to load propagator: %s", propagator)
158-
raise
150+
)
151+
).load()()
152+
)
153+
except StopIteration:
154+
raise ValueError(
155+
f"Propagator {propagator} not found. It is either misspelled or not installed."
156+
)
157+
except Exception: # pylint: disable=broad-exception-caught
158+
logger.exception("Failed to load propagator: %s", propagator)
159+
raise
159160

160161

161162
_HTTP_TEXT_FORMAT = composite.CompositePropagator(propagators) # type: ignore

opentelemetry-api/tests/propagators/test_propagators.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ def test_propagators(propagators):
6161
**{"side_effect": test_propagators}
6262
)
6363

64-
from importlib import reload
65-
66-
import opentelemetry.propagate
67-
68-
reload(opentelemetry.propagate)
69-
7064
@patch.dict(environ, {OTEL_PROPAGATORS: "a, b, c "})
7165
@patch("opentelemetry.propagators.composite.CompositePropagator")
7266
@patch("opentelemetry.util._importlib_metadata.entry_points")

0 commit comments

Comments
 (0)