File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 2
2
# (c) Copyright Instana Inc. 2020
3
3
4
4
""" Collection helper for the Python runtime """
5
+ import importlib .metadata
5
6
import os
6
7
import gc
7
8
import sys
8
9
import platform
9
10
import resource
10
11
import threading
11
12
from types import ModuleType
12
- from pkg_resources import DistributionNotFound , get_distribution
13
13
14
14
from instana .log import logger
15
15
from instana .version import VERSION
@@ -230,8 +230,8 @@ def gather_python_packages(self):
230
230
elif "version" in pkg_info :
231
231
versions [pkg_name ] = self .jsonable (pkg_info ["version" ])
232
232
else :
233
- versions [pkg_name ] = get_distribution (pkg_name ). version
234
- except DistributionNotFound :
233
+ versions [pkg_name ] = importlib . metadata . version (pkg_name )
234
+ except importlib . metadata . PackageNotFoundError :
235
235
pass
236
236
except Exception :
237
237
logger .debug ("gather_python_packages: could not process module: %s" , pkg_name )
Original file line number Diff line number Diff line change 6
6
from collections import defaultdict
7
7
from urllib import parse
8
8
9
- import pkg_resources
9
+ import importlib . metadata
10
10
11
11
from ..log import logger
12
12
@@ -65,8 +65,8 @@ def package_version():
65
65
"""
66
66
version = ""
67
67
try :
68
- version = pkg_resources . get_distribution ('instana' ). version
69
- except pkg_resources . DistributionNotFound :
68
+ version = importlib . metadata . version ('instana' )
69
+ except importlib . metadata . PackageNotFoundError :
70
70
version = 'unknown'
71
71
72
72
return version
You can’t perform that action at this time.
0 commit comments