Skip to content

Commit 65b0bfb

Browse files
committed
Refactor environment variable location
1 parent fcd7e86 commit 65b0bfb

File tree

5 files changed

+4
-58
lines changed

5 files changed

+4
-58
lines changed

opentelemetry-api/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ opentelemetry_propagator =
5757
tracecontext = opentelemetry.trace.propagation.tracecontext:TraceContextTextMapPropagator
5858
baggage = opentelemetry.baggage.propagation:W3CBaggagePropagator
5959
opentelemetry_environment_variables =
60-
api = opentelemetry.environment_variables.environment_variables
60+
api = opentelemetry.environment_variables
6161

6262
[options.extras_require]
6363
test =

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

-54
This file was deleted.

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
# limitations under the License.
1616
# pylint: disable=no-name-in-module
1717

18-
from argparse import ArgumentParser, REMAINDER
18+
from argparse import REMAINDER, ArgumentParser
1919
from logging import getLogger
2020
from os import environ, execl, getcwd
2121
from os.path import abspath, dirname, pathsep
2222
from shutil import which
23-
from pkg_resources import iter_entry_points
2423

24+
from pkg_resources import iter_entry_points
2525

2626
_logger = getLogger(__file__)
2727

opentelemetry-instrumentation/tests/test_run.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_exporter(self, _): # pylint: disable=no-self-use
113113

114114
with patch(
115115
"sys.argv",
116-
["instrument", "--OTEL_TRACES_EXPORTER", "jaeger", "1", "2"]
116+
["instrument", "--OTEL_TRACES_EXPORTER", "jaeger", "1", "2"],
117117
):
118118
auto_instrumentation.run()
119119
self.assertEqual(environ.get(OTEL_TRACES_EXPORTER), "jaeger")

0 commit comments

Comments
 (0)