File tree 5 files changed +11
-12
lines changed
opentelemetry-instrumentation/src/opentelemetry/instrumentation
5 files changed +11
-12
lines changed Original file line number Diff line number Diff line change 13
13
# limitations under the License.
14
14
15
15
from argparse import REMAINDER , ArgumentParser
16
+ from importlib .metadata import entry_points
16
17
from logging import getLogger
17
18
from os import environ , execl , getcwd
18
19
from os .path import abspath , dirname , pathsep
19
20
from re import sub
20
21
from shutil import which
21
22
22
- from importlib .metadata import entry_points
23
-
24
23
from opentelemetry .instrumentation .version import __version__
25
24
26
25
_logger = getLogger (__name__ )
@@ -48,7 +47,9 @@ def run() -> None:
48
47
49
48
argument_otel_environment_variable = {}
50
49
51
- for entry_point in entry_points (group = "opentelemetry_environment_variables" ):
50
+ for entry_point in entry_points (
51
+ group = "opentelemetry_environment_variables"
52
+ ):
52
53
environment_variable_module = entry_point .load ()
53
54
54
55
for attribute in dir (environment_variable_module ):
Original file line number Diff line number Diff line change 12
12
# See the License for the specific language governing permissions and
13
13
# limitations under the License.
14
14
15
+ from importlib .metadata import EntryPoint , distributions , entry_points
15
16
from logging import getLogger
16
17
from os import environ
17
18
18
- from importlib .metadata import entry_points , EntryPoint , distributions
19
-
20
19
from opentelemetry .instrumentation .dependencies import (
21
20
get_dist_dependency_conflicts ,
22
21
)
Original file line number Diff line number Diff line change 15
15
import argparse
16
16
import logging
17
17
import sys
18
+ from importlib .metadata import PackageNotFoundError , version
18
19
from subprocess import (
19
20
PIPE ,
20
21
CalledProcessError ,
24
25
)
25
26
26
27
from packaging .requirements import Requirement
27
- from importlib .metadata import PackageNotFoundError , version
28
28
29
29
from opentelemetry .instrumentation .bootstrap_gen import (
30
30
default_instrumentations ,
@@ -93,18 +93,18 @@ def _pip_check():
93
93
94
94
def _is_installed (req ):
95
95
req = Requirement (req )
96
-
96
+
97
97
try :
98
98
dist_version = version (req .name )
99
99
except PackageNotFoundError :
100
100
return False
101
-
101
+
102
102
if not req .specifier .filter (dist_version ):
103
103
logger .warning (
104
104
"instrumentation for package %s is available"
105
105
" but version %s is installed. Skipping." ,
106
106
req ,
107
- dist_version
107
+ dist_version ,
108
108
)
109
109
return False
110
110
return True
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ def get_dependency_conflicts(
52
52
dep ,
53
53
exc ,
54
54
)
55
- return DependencyConflict (dep )
55
+ return DependencyConflict (dep )
56
56
57
57
try :
58
58
dist_version = version (req .name )
Original file line number Diff line number Diff line change 18
18
"""
19
19
20
20
from abc import ABC , abstractmethod
21
- from logging import getLogger
22
-
23
21
from importlib .metadata import EntryPoint
22
+ from logging import getLogger
24
23
25
24
from opentelemetry .instrumentation .instrumentor import BaseInstrumentor
26
25
You can’t perform that action at this time.
0 commit comments