opentelemetry-instrumentation 0.48b0__tar.gz → 0.49b1__tar.gz

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation
-Version: 0.48b0
+Version: 0.49b1
 Summary: Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -18,7 +18,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.4
-Requires-Dist: setuptools>=16.0
+Requires-Dist: opentelemetry-semantic-conventions==0.49b1
+Requires-Dist: packaging>=18.0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Description-Content-Type: text/x-rst
 
@@ -64,7 +65,7 @@ to figure out which instrumentation packages the user might want to install. By
 prints out a list of the default and detected instrumentation packages that can be added to a
 requirements.txt file. It also supports installing the packages when run with
 :code:`--action=install` or :code:`-a install` flag. All default and detectable
-instrumentation packages are defined `here <https://github.com/flands/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py>`.
+instrumentation packages are defined `here <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py>`.
 
 
 opentelemetry-instrument

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/README.rst

@@ -40,7 +40,7 @@ to figure out which instrumentation packages the user might want to install. By
 prints out a list of the default and detected instrumentation packages that can be added to a
 requirements.txt file. It also supports installing the packages when run with
 :code:`--action=install` or :code:`-a install` flag. All default and detectable
-instrumentation packages are defined `here <https://github.com/flands/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py>`.
+instrumentation packages are defined `here <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py>`.
 
 
 opentelemetry-instrument

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/pyproject.toml

@@ -26,8 +26,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.4",
-  "setuptools >= 16.0",
+  "opentelemetry-semantic-conventions == 0.49b1",
   "wrapt >= 1.0.0, < 2.0.0",
+  "packaging >= 18.0",
 ]
 
 [project.scripts]

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py

@@ -19,9 +19,8 @@ from os.path import abspath, dirname, pathsep
 from re import sub
 from shutil import which
 
-from pkg_resources import iter_entry_points
-
 from opentelemetry.instrumentation.version import __version__
+from opentelemetry.util._importlib_metadata import entry_points
 
 _logger = getLogger(__name__)
 
@@ -48,8 +47,8 @@ def run() -> None:
 
     argument_otel_environment_variable = {}
 
-    for entry_point in iter_entry_points(
-        "opentelemetry_environment_variables"
+    for entry_point in entry_points(
+        group="opentelemetry_environment_variables"
     ):
         environment_variable_module = entry_point.load()
 

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/src/opentelemetry/instrumentation/auto_instrumentation/_load.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from logging import getLogger
 from os import environ
 
-from pkg_resources import iter_entry_points
-
 from opentelemetry.instrumentation.dependencies import (
     get_dist_dependency_conflicts,
 )
@@ -27,13 +26,39 @@ from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_DISTRO,
 )
 from opentelemetry.instrumentation.version import __version__
+from opentelemetry.util._importlib_metadata import (
+    EntryPoint,
+    distributions,
+    entry_points,
+)
 
 _logger = getLogger(__name__)
 
 
+class _EntryPointDistFinder:
+    @cached_property
+    def _mapping(self):
+        return {
+            self._key_for(ep): dist
+            for dist in distributions()
+            for ep in dist.entry_points
+        }
+
+    def dist_for(self, entry_point: EntryPoint):
+        dist = getattr(entry_point, "dist", None)
+        if dist:
+            return dist
+
+        return self._mapping.get(self._key_for(entry_point))
+
+    @staticmethod
+    def _key_for(entry_point: EntryPoint):
+        return f"{entry_point.group}:{entry_point.name}:{entry_point.value}"
+
+
 def _load_distro() -> BaseDistro:
     distro_name = environ.get(OTEL_PYTHON_DISTRO, None)
-    for entry_point in iter_entry_points("opentelemetry_distro"):
+    for entry_point in entry_points(group="opentelemetry_distro"):
         try:
             # If no distro is specified, use first to come up.
             if distro_name is None or distro_name == entry_point.name:
@@ -58,15 +83,16 @@ def _load_distro() -> BaseDistro:
 
 def _load_instrumentors(distro):
     package_to_exclude = environ.get(OTEL_PYTHON_DISABLED_INSTRUMENTATIONS, [])
+    entry_point_finder = _EntryPointDistFinder()
     if isinstance(package_to_exclude, str):
         package_to_exclude = package_to_exclude.split(",")
         # to handle users entering "requests , flask" or "requests, flask" with spaces
         package_to_exclude = [x.strip() for x in package_to_exclude]
 
-    for entry_point in iter_entry_points("opentelemetry_pre_instrument"):
+    for entry_point in entry_points(group="opentelemetry_pre_instrument"):
         entry_point.load()()
 
-    for entry_point in iter_entry_points("opentelemetry_instrumentor"):
+    for entry_point in entry_points(group="opentelemetry_instrumentor"):
         if entry_point.name in package_to_exclude:
             _logger.debug(
                 "Instrumentation skipped for library %s", entry_point.name
@@ -74,7 +100,8 @@ def _load_instrumentors(distro):
             continue
 
         try:
-            conflict = get_dist_dependency_conflicts(entry_point.dist)
+            entry_point_dist = entry_point_finder.dist_for(entry_point)
+            conflict = get_dist_dependency_conflicts(entry_point_dist)
             if conflict:
                 _logger.debug(
                     "Skipping instrumentation %s: %s",
@@ -86,18 +113,29 @@ def _load_instrumentors(distro):
             # tell instrumentation to not run dep checks again as we already did it above
             distro.load_instrumentor(entry_point, skip_dep_check=True)
             _logger.debug("Instrumented %s", entry_point.name)
+        except ImportError:
+            # in scenarios using the kubernetes operator to do autoinstrumentation some
+            # instrumentors (usually requiring binary extensions) may fail to load
+            # because the injected autoinstrumentation code does not match the application
+            # environment regarding python version, libc, etc... In this case it's better
+            # to skip the single instrumentation rather than failing to load everything
+            # so treat differently ImportError than the rest of exceptions
+            _logger.exception(
+                "Importing of %s failed, skipping it", entry_point.name
+            )
+            continue
         except Exception as exc:  # pylint: disable=broad-except
             _logger.exception("Instrumenting of %s failed", entry_point.name)
             raise exc
 
-    for entry_point in iter_entry_points("opentelemetry_post_instrument"):
+    for entry_point in entry_points(group="opentelemetry_post_instrument"):
         entry_point.load()()
 
 
 def _load_configurators():
     configurator_name = environ.get(OTEL_PYTHON_CONFIGURATOR, None)
     configured = None
-    for entry_point in iter_entry_points("opentelemetry_configurator"):
+    for entry_point in entry_points(group="opentelemetry_configurator"):
         if configured is not None:
             _logger.warning(
                 "Configuration of %s not loaded, %s already loaded",
@@ -110,7 +148,9 @@ def _load_configurators():
                 configurator_name is None
                 or configurator_name == entry_point.name
             ):
-                entry_point.load()().configure(auto_instrumentation_version=__version__)  # type: ignore
+                entry_point.load()().configure(
+                    auto_instrumentation_version=__version__
+                )  # type: ignore
                 configured = entry_point.name
             else:
                 _logger.warning(

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/src/opentelemetry/instrumentation/bootstrap.py

@@ -22,14 +22,21 @@ from subprocess import (
     SubprocessError,
     check_call,
 )
+from typing import Optional
 
-import pkg_resources
+from packaging.requirements import Requirement
 
 from opentelemetry.instrumentation.bootstrap_gen import (
-    default_instrumentations,
-    libraries,
+    default_instrumentations as gen_default_instrumentations,
+)
+from opentelemetry.instrumentation.bootstrap_gen import (
+    libraries as gen_libraries,
 )
 from opentelemetry.instrumentation.version import __version__
+from opentelemetry.util._importlib_metadata import (
+    PackageNotFoundError,
+    version,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -71,7 +78,7 @@ def _sys_pip_install(package):
         print(error)
 
 
-def _pip_check():
+def _pip_check(libraries):
     """Ensures none of the instrumentations have dependency conflicts.
     Clean check reported as:
     'No broken requirements found.'
@@ -91,24 +98,25 @@ def _pip_check():
 
 
 def _is_installed(req):
-    if req in sys.modules:
-        return True
+    req = Requirement(req)
 
     try:
-        pkg_resources.get_distribution(req)
-    except pkg_resources.DistributionNotFound:
+        dist_version = version(req.name)
+    except PackageNotFoundError:
         return False
-    except pkg_resources.VersionConflict as exc:
+
+    if not req.specifier.filter(dist_version):
         logger.warning(
-            "instrumentation for package %s is available but version %s is installed. Skipping.",
-            exc.req,
-            exc.dist.as_requirement(),  # pylint: disable=no-member
+            "instrumentation for package %s is available"
+            " but version %s is installed. Skipping.",
+            req,
+            dist_version,
         )
         return False
     return True
 
 
-def _find_installed_libraries():
+def _find_installed_libraries(default_instrumentations, libraries):
     for lib in default_instrumentations:
         yield lib
 
@@ -117,18 +125,25 @@ def _find_installed_libraries():
             yield lib["instrumentation"]
 
 
-def _run_requirements():
+def _run_requirements(default_instrumentations, libraries):
     logger.setLevel(logging.ERROR)
-    print("\n".join(_find_installed_libraries()))
+    print(
+        "\n".join(
+            _find_installed_libraries(default_instrumentations, libraries)
+        )
+    )
 
 
-def _run_install():
-    for lib in _find_installed_libraries():
+def _run_install(default_instrumentations, libraries):
+    for lib in _find_installed_libraries(default_instrumentations, libraries):
         _sys_pip_install(lib)
-    _pip_check()
+    _pip_check(libraries)
 
 
-def run() -> None:
+def run(
+    default_instrumentations: Optional[list] = None,
+    libraries: Optional[list] = None,
+) -> None:
     action_install = "install"
     action_requirements = "requirements"
 
@@ -158,8 +173,14 @@ def run() -> None:
     )
     args = parser.parse_args()
 
+    if libraries is None:
+        libraries = gen_libraries
+
+    if default_instrumentations is None:
+        default_instrumentations = gen_default_instrumentations
+
     cmd = {
         action_install: _run_install,
         action_requirements: _run_requirements,
     }[args.action]
-    cmd()
+    cmd(default_instrumentations, libraries)

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -18,179 +18,183 @@
 libraries = [
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.49b1",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.49b1",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.49b1",
+    },
+    {
+        "library": "aiokafka >= 0.8, < 1.0",
+        "instrumentation": "opentelemetry-instrumentation-aiokafka==0.49b1",
     },
     {
         "library": "aiopg >= 0.13.0, < 2.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aiopg==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-aiopg==0.49b1",
     },
     {
         "library": "asgiref ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-asgi==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-asgi==0.49b1",
     },
     {
         "library": "asyncpg >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.49b1",
     },
     {
         "library": "boto~=2.0",
-        "instrumentation": "opentelemetry-instrumentation-boto==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-boto==0.49b1",
     },
     {
         "library": "boto3 ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.49b1",
     },
     {
         "library": "botocore ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-botocore==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-botocore==0.49b1",
     },
     {
         "library": "cassandra-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.49b1",
     },
     {
         "library": "scylla-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.49b1",
     },
     {
         "library": "celery >= 4.0, < 6.0",
-        "instrumentation": "opentelemetry-instrumentation-celery==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-celery==0.49b1",
     },
     {
         "library": "confluent-kafka >= 1.8.2, <= 2.4.0",
-        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.49b1",
     },
     {
         "library": "django >= 1.10",
-        "instrumentation": "opentelemetry-instrumentation-django==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-django==0.49b1",
     },
     {
         "library": "elasticsearch >= 6.0",
-        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.49b1",
     },
     {
         "library": "falcon >= 1.4.1, < 3.1.2",
-        "instrumentation": "opentelemetry-instrumentation-falcon==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-falcon==0.49b1",
     },
     {
         "library": "fastapi ~= 0.58",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.49b1",
     },
     {
         "library": "flask >= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.49b1",
     },
     {
-        "library": "grpcio ~= 1.27",
-        "instrumentation": "opentelemetry-instrumentation-grpc==0.48b0",
+        "library": "grpcio >= 1.42.0",
+        "instrumentation": "opentelemetry-instrumentation-grpc==0.49b1",
     },
     {
         "library": "httpx >= 0.18.0",
-        "instrumentation": "opentelemetry-instrumentation-httpx==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-httpx==0.49b1",
     },
     {
         "library": "jinja2 >= 2.7, < 4.0",
-        "instrumentation": "opentelemetry-instrumentation-jinja2==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-jinja2==0.49b1",
     },
     {
         "library": "kafka-python >= 2.0, < 3.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.49b1",
     },
     {
         "library": "kafka-python-ng >= 2.0, < 3.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.49b1",
     },
     {
         "library": "mysql-connector-python >= 8.0, < 10.0",
-        "instrumentation": "opentelemetry-instrumentation-mysql==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-mysql==0.49b1",
     },
     {
         "library": "mysqlclient < 3",
-        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.49b1",
     },
     {
         "library": "pika >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-pika==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-pika==0.49b1",
     },
     {
         "library": "psycopg >= 3.1.0",
-        "instrumentation": "opentelemetry-instrumentation-psycopg==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg==0.49b1",
     },
     {
         "library": "psycopg2 >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.49b1",
     },
     {
         "library": "pymemcache >= 1.3.5, < 5",
-        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.49b1",
     },
     {
         "library": "pymongo >= 3.1, < 5.0",
-        "instrumentation": "opentelemetry-instrumentation-pymongo==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-pymongo==0.49b1",
     },
     {
         "library": "PyMySQL < 2",
-        "instrumentation": "opentelemetry-instrumentation-pymysql==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-pymysql==0.49b1",
     },
     {
         "library": "pyramid >= 1.7",
-        "instrumentation": "opentelemetry-instrumentation-pyramid==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-pyramid==0.49b1",
     },
     {
         "library": "redis >= 2.6",
-        "instrumentation": "opentelemetry-instrumentation-redis==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-redis==0.49b1",
     },
     {
         "library": "remoulade >= 0.50",
-        "instrumentation": "opentelemetry-instrumentation-remoulade==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-remoulade==0.49b1",
     },
     {
         "library": "requests ~= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-requests==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-requests==0.49b1",
     },
     {
-        "library": "sqlalchemy",
-        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.48b0",
+        "library": "sqlalchemy >= 1.0.0, < 2.1.0",
+        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.49b1",
     },
     {
         "library": "starlette ~= 0.13.0",
-        "instrumentation": "opentelemetry-instrumentation-starlette==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-starlette==0.49b1",
     },
     {
         "library": "psutil >= 5",
-        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.49b1",
     },
     {
         "library": "tornado >= 5.1.1",
-        "instrumentation": "opentelemetry-instrumentation-tornado==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-tornado==0.49b1",
     },
     {
         "library": "tortoise-orm >= 0.17.0",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.49b1",
     },
     {
         "library": "pydantic >= 1.10.2",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.49b1",
     },
     {
         "library": "urllib3 >= 1.0.0, < 3.0.0",
-        "instrumentation": "opentelemetry-instrumentation-urllib3==0.48b0",
+        "instrumentation": "opentelemetry-instrumentation-urllib3==0.49b1",
     },
 ]
 default_instrumentations = [
-    "opentelemetry-instrumentation-asyncio==0.48b0",
-    "opentelemetry-instrumentation-dbapi==0.48b0",
-    "opentelemetry-instrumentation-logging==0.48b0",
-    "opentelemetry-instrumentation-sqlite3==0.48b0",
-    "opentelemetry-instrumentation-threading==0.48b0",
-    "opentelemetry-instrumentation-urllib==0.48b0",
-    "opentelemetry-instrumentation-wsgi==0.48b0",
+    "opentelemetry-instrumentation-asyncio==0.49b1",
+    "opentelemetry-instrumentation-dbapi==0.49b1",
+    "opentelemetry-instrumentation-logging==0.49b1",
+    "opentelemetry-instrumentation-sqlite3==0.49b1",
+    "opentelemetry-instrumentation-threading==0.49b1",
+    "opentelemetry-instrumentation-urllib==0.49b1",
+    "opentelemetry-instrumentation-wsgi==0.49b1",
 ]

opentelemetry_instrumentation-0.49b1/src/opentelemetry/instrumentation/dependencies.py

@@ -0,0 +1,83 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from logging import getLogger
+from typing import Collection, Optional, Union
+
+from packaging.requirements import InvalidRequirement, Requirement
+
+from opentelemetry.util._importlib_metadata import (
+    Distribution,
+    PackageNotFoundError,
+    version,
+)
+
+logger = getLogger(__name__)
+
+
+class DependencyConflict:
+    required: str = None
+    found: Optional[str] = None
+
+    def __init__(self, required, found=None):
+        self.required = required
+        self.found = found
+
+    def __str__(self):
+        return f'DependencyConflict: requested: "{self.required}" but found: "{self.found}"'
+
+
+def get_dist_dependency_conflicts(
+    dist: Distribution,
+) -> Optional[DependencyConflict]:
+    instrumentation_deps = []
+    extra = "extra"
+    instruments = "instruments"
+    instruments_marker = {extra: instruments}
+    for dep in dist.requires:
+        if extra not in dep or instruments not in dep:
+            continue
+
+        req = Requirement(dep)
+        if req.marker.evaluate(instruments_marker):
+            instrumentation_deps.append(req)
+
+    return get_dependency_conflicts(instrumentation_deps)
+
+
+def get_dependency_conflicts(
+    deps: Collection[Union[str, Requirement]],
+) -> Optional[DependencyConflict]:
+    for dep in deps:
+        if isinstance(dep, Requirement):
+            req = dep
+        else:
+            try:
+                req = Requirement(dep)
+            except InvalidRequirement as exc:
+                logger.warning(
+                    'error parsing dependency, reporting as a conflict: "%s" - %s',
+                    dep,
+                    exc,
+                )
+                return DependencyConflict(dep)
+
+        try:
+            dist_version = version(req.name)
+        except PackageNotFoundError:
+            return DependencyConflict(dep)
+
+        if not req.specifier.contains(dist_version):
+            return DependencyConflict(dep, f"{req.name} {dist_version}")
+    return None

{opentelemetry_instrumentation-0.48b0 → opentelemetry_instrumentation-0.49b1}/src/opentelemetry/instrumentation/distro.py

@@ -20,9 +20,8 @@ OpenTelemetry Base Distribution (Distro)
 from abc import ABC, abstractmethod
 from logging import getLogger
 
-from pkg_resources import EntryPoint
-
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.util._importlib_metadata import EntryPoint
 
 _LOG = getLogger(__name__)
 
@@ -33,7 +32,6 @@ class BaseDistro(ABC):
     _instance = None
 
     def __new__(cls, *args, **kwargs):
-
         if cls._instance is None:
             cls._instance = object.__new__(cls, *args, **kwargs)