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 22# (c) Copyright Instana Inc. 2020
33
44""" Collection helper for the Python runtime """
5+ import importlib .metadata
56import os
67import gc
78import sys
89import platform
910import resource
1011import threading
1112from types import ModuleType
12- from pkg_resources import DistributionNotFound , get_distribution
1313
1414from instana .log import logger
1515from instana .version import VERSION
@@ -230,8 +230,8 @@ def gather_python_packages(self):
230230 elif "version" in pkg_info :
231231 versions [pkg_name ] = self .jsonable (pkg_info ["version" ])
232232 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 :
235235 pass
236236 except Exception :
237237 logger .debug ("gather_python_packages: could not process module: %s" , pkg_name )
Original file line number Diff line number Diff line change 66from collections import defaultdict
77from urllib import parse
88
9- import pkg_resources
9+ import importlib . metadata
1010
1111from ..log import logger
1212
@@ -65,8 +65,8 @@ def package_version():
6565 """
6666 version = ""
6767 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 :
7070 version = 'unknown'
7171
7272 return version
You can’t perform that action at this time.
0 commit comments