Skip to content

Commit 9750c8b

Browse files
Rodrigo-Novasocelotl
authored andcommitted
feat: execute tox
1 parent 2364780 commit 9750c8b

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
# limitations under the License.
1414

1515
from argparse import REMAINDER, ArgumentParser
16+
from importlib.metadata import entry_points
1617
from logging import getLogger
1718
from os import environ, execl, getcwd
1819
from os.path import abspath, dirname, pathsep
1920
from re import sub
2021
from shutil import which
2122

22-
from importlib.metadata import entry_points
23-
2423
from opentelemetry.instrumentation.version import __version__
2524

2625
_logger = getLogger(__name__)
@@ -48,7 +47,9 @@ def run() -> None:
4847

4948
argument_otel_environment_variable = {}
5049

51-
for entry_point in entry_points(group="opentelemetry_environment_variables"):
50+
for entry_point in entry_points(
51+
group="opentelemetry_environment_variables"
52+
):
5253
environment_variable_module = entry_point.load()
5354

5455
for attribute in dir(environment_variable_module):

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
from importlib.metadata import EntryPoint, distributions, entry_points
1516
from logging import getLogger
1617
from os import environ
1718

18-
from importlib.metadata import entry_points, EntryPoint, distributions
19-
2019
from opentelemetry.instrumentation.dependencies import (
2120
get_dist_dependency_conflicts,
2221
)

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import argparse
1616
import logging
1717
import sys
18+
from importlib.metadata import PackageNotFoundError, version
1819
from subprocess import (
1920
PIPE,
2021
CalledProcessError,
@@ -24,7 +25,6 @@
2425
)
2526

2627
from packaging.requirements import Requirement
27-
from importlib.metadata import PackageNotFoundError, version
2828

2929
from opentelemetry.instrumentation.bootstrap_gen import (
3030
default_instrumentations,
@@ -93,18 +93,18 @@ def _pip_check():
9393

9494
def _is_installed(req):
9595
req = Requirement(req)
96-
96+
9797
try:
9898
dist_version = version(req.name)
9999
except PackageNotFoundError:
100100
return False
101-
101+
102102
if not req.specifier.filter(dist_version):
103103
logger.warning(
104104
"instrumentation for package %s is available"
105105
" but version %s is installed. Skipping.",
106106
req,
107-
dist_version
107+
dist_version,
108108
)
109109
return False
110110
return True

opentelemetry-instrumentation/src/opentelemetry/instrumentation/dependencies.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def get_dependency_conflicts(
5252
dep,
5353
exc,
5454
)
55-
return DependencyConflict(dep)
55+
return DependencyConflict(dep)
5656

5757
try:
5858
dist_version = version(req.name)

opentelemetry-instrumentation/src/opentelemetry/instrumentation/distro.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
"""
1919

2020
from abc import ABC, abstractmethod
21-
from logging import getLogger
22-
2321
from importlib.metadata import EntryPoint
22+
from logging import getLogger
2423

2524
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
2625

0 commit comments

Comments
 (0)