opentelemetry-instrumentation 0.52b1__tar.gz → 0.53b1__tar.gz

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentelemetry-instrumentation
-Version: 0.52b1
+Version: 0.53b1
 Summary: Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
 Project-URL: Repository, https://github.com/open-telemetry/opentelemetry-python-contrib
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.4
-Requires-Dist: opentelemetry-semantic-conventions==0.52b1
+Requires-Dist: opentelemetry-semantic-conventions==0.53b1
 Requires-Dist: packaging>=18.0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Description-Content-Type: text/x-rst

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.4",
-  "opentelemetry-semantic-conventions == 0.52b1",
+  "opentelemetry-semantic-conventions == 0.53b1",
   "wrapt >= 1.0.0, < 2.0.0",
   "packaging >= 18.0",
 ]

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/_semconv.py

@@ -354,7 +354,8 @@ def _set_http_host_server(result, host, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
         set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
     if _report_new(sem_conv_opt_in_mode):
-        set_string_attribute(result, CLIENT_ADDRESS, host)
+        if not result.get(SERVER_ADDRESS):
+            set_string_attribute(result, SERVER_ADDRESS, host)
 
 
 # net.peer.ip -> net.sock.peer.addr

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/auto_instrumentation/_load.py

@@ -12,13 +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 opentelemetry.instrumentation.dependencies import (
-    get_dist_dependency_conflicts,
-)
+from opentelemetry.instrumentation.dependencies import DependencyConflictError
 from opentelemetry.instrumentation.distro import BaseDistro, DefaultDistro
 from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_CONFIGURATOR,
@@ -26,36 +23,11 @@ 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,
-)
+from opentelemetry.util._importlib_metadata import 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 entry_points(group="opentelemetry_distro"):
@@ -83,7 +55,6 @@ 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
@@ -100,19 +71,25 @@ def _load_instrumentors(distro):
             continue
 
         try:
-            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",
-                    entry_point.name,
-                    conflict,
-                )
-                continue
-
-            # tell instrumentation to not run dep checks again as we already did it above
-            distro.load_instrumentor(entry_point, skip_dep_check=True)
+            distro.load_instrumentor(
+                entry_point, raise_exception_on_conflict=True
+            )
             _logger.debug("Instrumented %s", entry_point.name)
+        except DependencyConflictError as exc:
+            _logger.debug(
+                "Skipping instrumentation %s: %s",
+                entry_point.name,
+                exc.conflict,
+            )
+            continue
+        except ModuleNotFoundError as exc:
+            # ModuleNotFoundError is raised when the library is not installed
+            # and the instrumentation is not required to be loaded.
+            # See https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3421
+            _logger.debug(
+                "Skipping instrumentation %s: %s", entry_point.name, exc.msg
+            )
+            continue
         except ImportError:
             # in scenarios using the kubernetes operator to do autoinstrumentation some
             # instrumentors (usually requiring binary extensions) may fail to load

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/bootstrap_gen.py

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

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/dependencies.py

@@ -20,7 +20,6 @@ from typing import Collection
 from packaging.requirements import InvalidRequirement, Requirement
 
 from opentelemetry.util._importlib_metadata import (
-    Distribution,
     PackageNotFoundError,
     version,
 )
@@ -40,23 +39,14 @@ class DependencyConflict:
         return f'DependencyConflict: requested: "{self.required}" but found: "{self.found}"'
 
 
-def get_dist_dependency_conflicts(
-    dist: Distribution,
-) -> DependencyConflict | None:
-    instrumentation_deps = []
-    extra = "extra"
-    instruments = "instruments"
-    instruments_marker = {extra: instruments}
-    if dist.requires:
-        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)
+class DependencyConflictError(Exception):
+    conflict: DependencyConflict
+
+    def __init__(self, conflict: DependencyConflict):
+        self.conflict = conflict
+
+    def __str__(self):
+        return str(self.conflict)
 
 
 def get_dependency_conflicts(

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/instrumentor.py

@@ -28,6 +28,7 @@ from opentelemetry.instrumentation._semconv import (
 )
 from opentelemetry.instrumentation.dependencies import (
     DependencyConflict,
+    DependencyConflictError,
     get_dependency_conflicts,
 )
 
@@ -104,10 +105,15 @@ class BaseInstrumentor(ABC):
 
         # check if instrumentor has any missing or conflicting dependencies
         skip_dep_check = kwargs.pop("skip_dep_check", False)
+        raise_exception_on_conflict = kwargs.pop(
+            "raise_exception_on_conflict", False
+        )
         if not skip_dep_check:
             conflict = self._check_dependency_conflicts()
             if conflict:
                 _LOG.error(conflict)
+                if raise_exception_on_conflict:
+                    raise DependencyConflictError(conflict)
                 return None
 
         # initialize semantic conventions opt-in if needed

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/sqlcommenter_utils.py

@@ -23,7 +23,7 @@ def _add_sql_comment(sql, **meta) -> str:
     meta.update(**_add_framework_tags())
     comment = _generate_sql_comment(**meta)
     sql = sql.rstrip()
-    if sql[-1] == ";":
+    if sql.endswith(";"):
         sql = sql[:-1] + comment + ";"
     else:
         sql = sql + comment

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/src/opentelemetry/instrumentation/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.52b1"
+__version__ = "0.53b1"

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/tests/auto_instrumentation/test_load.py

@@ -17,13 +17,16 @@ from unittest import TestCase
 from unittest.mock import Mock, call, patch
 
 from opentelemetry.instrumentation.auto_instrumentation import _load
+from opentelemetry.instrumentation.dependencies import (
+    DependencyConflict,
+    DependencyConflictError,
+)
 from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_CONFIGURATOR,
     OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
     OTEL_PYTHON_DISTRO,
 )
 from opentelemetry.instrumentation.version import __version__
-from opentelemetry.util._importlib_metadata import EntryPoint, entry_points
 
 
 class TestLoad(TestCase):
@@ -200,17 +203,20 @@ class TestLoad(TestCase):
         # Confirm method raises exception if it fails to load a distro.
         self.assertRaises(Exception, _load._load_distro)
 
+    @staticmethod
+    def _instrumentation_failed_to_load_call(entry_point, dependency_conflict):
+        return call(
+            "Skipping instrumentation %s: %s", entry_point, dependency_conflict
+        )
+
     @patch.dict(
         "os.environ",
         {OTEL_PYTHON_DISABLED_INSTRUMENTATIONS: " instr1 , instr3 "},
     )
-    @patch(
-        "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
-    )
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
     )
-    def test_load_instrumentors(self, iter_mock, dep_mock):
+    def test_load_instrumentors(self, iter_mock):
         # Mock opentelemetry_pre_instrument entry points
         # pylint: disable=too-many-locals
         pre_ep_mock1 = Mock()
@@ -255,8 +261,6 @@ class TestLoad(TestCase):
             (ep_mock1, ep_mock2, ep_mock3, ep_mock4),
             (post_ep_mock1, post_ep_mock2),
         ]
-        # No dependency conflict
-        dep_mock.return_value = None
         _load._load_instrumentors(distro_mock)
         # All opentelemetry_pre_instrument entry points should be loaded
         pre_mock1.assert_called_once()
@@ -265,8 +269,8 @@ class TestLoad(TestCase):
         # Only non-disabled instrumentations should be loaded
         distro_mock.load_instrumentor.assert_has_calls(
             [
-                call(ep_mock2, skip_dep_check=True),
-                call(ep_mock4, skip_dep_check=True),
+                call(ep_mock2, raise_exception_on_conflict=True),
+                call(ep_mock4, raise_exception_on_conflict=True),
             ]
         )
         self.assertEqual(distro_mock.load_instrumentor.call_count, 2)
@@ -278,13 +282,11 @@ class TestLoad(TestCase):
         "os.environ",
         {OTEL_PYTHON_DISABLED_INSTRUMENTATIONS: " instr1 , instr3 "},
     )
-    @patch(
-        "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
-    )
+    @patch("opentelemetry.instrumentation.auto_instrumentation._load._logger")
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
     )
-    def test_load_instrumentors_dep_conflict(self, iter_mock, dep_mock):  # pylint: disable=no-self-use
+    def test_load_instrumentors_dep_conflict(self, iter_mock, mock_logger):  # pylint: disable=no-self-use
         ep_mock1 = Mock()
         ep_mock1.name = "instr1"
 
@@ -297,27 +299,39 @@ class TestLoad(TestCase):
         ep_mock4 = Mock()
         ep_mock4.name = "instr4"
 
+        dependency_conflict = DependencyConflict("1.2.3", None)
+
         distro_mock = Mock()
+        distro_mock.load_instrumentor.side_effect = [
+            None,
+            DependencyConflictError(dependency_conflict),
+        ]
 
-        iter_mock.return_value = (ep_mock1, ep_mock2, ep_mock3, ep_mock4)
         # If a dependency conflict is raised, that instrumentation should not be loaded, but others still should.
-        dep_mock.side_effect = [None, "DependencyConflict"]
+        # In this case, ep_mock4 will fail to load and ep_mock2 will succeed. (ep_mock1 and ep_mock3 are disabled)
+        iter_mock.return_value = (ep_mock1, ep_mock2, ep_mock3, ep_mock4)
         _load._load_instrumentors(distro_mock)
         distro_mock.load_instrumentor.assert_has_calls(
             [
-                call(ep_mock2, skip_dep_check=True),
+                call(ep_mock2, raise_exception_on_conflict=True),
+                call(ep_mock4, raise_exception_on_conflict=True),
+            ]
+        )
+        assert distro_mock.load_instrumentor.call_count == 2
+        mock_logger.debug.assert_has_calls(
+            [
+                self._instrumentation_failed_to_load_call(
+                    ep_mock4.name, dependency_conflict
+                )
             ]
         )
-        distro_mock.load_instrumentor.assert_called_once()
 
-    @patch(
-        "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
-    )
+    @patch("opentelemetry.instrumentation.auto_instrumentation._load._logger")
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
     )
     def test_load_instrumentors_import_error_does_not_stop_everything(
-        self, iter_mock, dep_mock
+        self, iter_mock, mock_logger
     ):
         ep_mock1 = Mock(name="instr1")
         ep_mock2 = Mock(name="instr2")
@@ -331,25 +345,27 @@ class TestLoad(TestCase):
             (ep_mock1, ep_mock2),
             (),
         ]
-        dep_mock.return_value = None
 
         _load._load_instrumentors(distro_mock)
 
         distro_mock.load_instrumentor.assert_has_calls(
             [
-                call(ep_mock1, skip_dep_check=True),
-                call(ep_mock2, skip_dep_check=True),
+                call(ep_mock1, raise_exception_on_conflict=True),
+                call(ep_mock2, raise_exception_on_conflict=True),
             ]
         )
         self.assertEqual(distro_mock.load_instrumentor.call_count, 2)
+        mock_logger.exception.assert_any_call(
+            "Importing of %s failed, skipping it",
+            ep_mock1.name,
+        )
+
+        mock_logger.debug.assert_any_call("Instrumented %s", ep_mock2.name)
 
-    @patch(
-        "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
-    )
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
     )
-    def test_load_instrumentors_raises_exception(self, iter_mock, dep_mock):
+    def test_load_instrumentors_raises_exception(self, iter_mock):
         ep_mock1 = Mock(name="instr1")
         ep_mock2 = Mock(name="instr2")
 
@@ -362,48 +378,59 @@ class TestLoad(TestCase):
             (ep_mock1, ep_mock2),
             (),
         ]
-        dep_mock.return_value = None
 
         with self.assertRaises(ValueError):
             _load._load_instrumentors(distro_mock)
 
         distro_mock.load_instrumentor.assert_has_calls(
             [
-                call(ep_mock1, skip_dep_check=True),
+                call(ep_mock1, raise_exception_on_conflict=True),
             ]
         )
         self.assertEqual(distro_mock.load_instrumentor.call_count, 1)
 
-    def test_load_instrumentors_no_entry_point_mocks(self):
+    @patch("opentelemetry.instrumentation.auto_instrumentation._load._logger")
+    @patch(
+        "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
+    )
+    def test_load_instrumentors_module_not_found_error(
+        self, iter_mock, mock_logger
+    ):
+        ep_mock1 = Mock()
+        ep_mock1.name = "instr1"
+
+        ep_mock2 = Mock()
+        ep_mock2.name = "instr2"
+
         distro_mock = Mock()
+
+        distro_mock.load_instrumentor.side_effect = [
+            ModuleNotFoundError("No module named 'fake_module'"),
+            None,
+        ]
+
+        iter_mock.side_effect = [(), (ep_mock1, ep_mock2), ()]
+
         _load._load_instrumentors(distro_mock)
-        # this has no specific assert because it is run for every instrumentation
-        self.assertTrue(distro_mock)
 
-    def test_entry_point_dist_finder(self):
-        entry_point_finder = _load._EntryPointDistFinder()
-        self.assertTrue(entry_point_finder._mapping)
-        entry_point = list(
-            entry_points(group="opentelemetry_environment_variables")
-        )[0]
-        self.assertTrue(entry_point)
-        self.assertTrue(entry_point.dist)
-
-        # this will not hit cache
-        entry_point_dist = entry_point_finder.dist_for(entry_point)
-        self.assertTrue(entry_point_dist)
-        # dist are not comparable so we are sure we are not hitting the cache
-        self.assertEqual(entry_point.dist, entry_point_dist)
-
-        # this will hit cache
-        entry_point_without_dist = EntryPoint(
-            name=entry_point.name,
-            group=entry_point.group,
-            value=entry_point.value,
+        distro_mock.load_instrumentor.assert_has_calls(
+            [
+                call(ep_mock1, raise_exception_on_conflict=True),
+                call(ep_mock2, raise_exception_on_conflict=True),
+            ]
         )
-        self.assertIsNone(entry_point_without_dist.dist)
-        new_entry_point_dist = entry_point_finder.dist_for(
-            entry_point_without_dist
+        self.assertEqual(distro_mock.load_instrumentor.call_count, 2)
+
+        mock_logger.debug.assert_any_call(
+            "Skipping instrumentation %s: %s",
+            "instr1",
+            "No module named 'fake_module'",
         )
-        # dist are not comparable, being truthy is enough
-        self.assertTrue(new_entry_point_dist)
+
+        mock_logger.debug.assert_any_call("Instrumented %s", ep_mock2.name)
+
+    def test_load_instrumentors_no_entry_point_mocks(self):
+        distro_mock = Mock()
+        _load._load_instrumentors(distro_mock)
+        # this has no specific assert because it is run for every instrumentation
+        self.assertTrue(distro_mock)

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/tests/test_dependencies.py

@@ -20,10 +20,8 @@ from packaging.requirements import Requirement
 from opentelemetry.instrumentation.dependencies import (
     DependencyConflict,
     get_dependency_conflicts,
-    get_dist_dependency_conflicts,
 )
 from opentelemetry.test.test_base import TestBase
-from opentelemetry.util._importlib_metadata import Distribution
 
 
 class TestDependencyConflicts(TestBase):
@@ -64,41 +62,3 @@ class TestDependencyConflicts(TestBase):
             str(conflict),
             f'DependencyConflict: requested: "pytest == 5000" but found: "pytest {pytest.__version__}"',
         )
-
-    def test_get_dist_dependency_conflicts(self):
-        class MockDistribution(Distribution):
-            def locate_file(self, path):
-                pass
-
-            def read_text(self, filename):
-                pass
-
-            @property
-            def requires(self):
-                return ['test-pkg ~= 1.0; extra == "instruments"']
-
-        dist = MockDistribution()
-
-        conflict = get_dist_dependency_conflicts(dist)
-        self.assertTrue(conflict is not None)
-        self.assertTrue(isinstance(conflict, DependencyConflict))
-        self.assertEqual(
-            str(conflict),
-            'DependencyConflict: requested: "test-pkg~=1.0; extra == "instruments"" but found: "None"',
-        )
-
-    def test_get_dist_dependency_conflicts_requires_none(self):
-        class MockDistribution(Distribution):
-            def locate_file(self, path):
-                pass
-
-            def read_text(self, filename):
-                pass
-
-            @property
-            def requires(self):
-                return None
-
-        dist = MockDistribution()
-        conflict = get_dist_dependency_conflicts(dist)
-        self.assertTrue(conflict is None)

{opentelemetry_instrumentation-0.52b1 → opentelemetry_instrumentation-0.53b1}/tests/test_instrumentor.py

@@ -15,7 +15,12 @@
 
 from logging import WARNING
 from unittest import TestCase
+from unittest.mock import patch
 
+from opentelemetry.instrumentation.dependencies import (
+    DependencyConflict,
+    DependencyConflictError,
+)
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 
 
@@ -48,3 +53,21 @@ class TestInstrumentor(TestCase):
 
     def test_singleton(self):
         self.assertIs(self.Instrumentor(), self.Instrumentor())
+
+    @patch(
+        "opentelemetry.instrumentation.instrumentor.BaseInstrumentor._check_dependency_conflicts"
+    )
+    def test_instrument_missing_dependency_raise(
+        self, mock__check_dependency_conflicts
+    ):
+        instrumentor = self.Instrumentor()
+
+        mock__check_dependency_conflicts.return_value = DependencyConflict(
+            "missing", "missing"
+        )
+
+        self.assertRaises(
+            DependencyConflictError,
+            instrumentor.instrument,
+            raise_exception_on_conflict=True,
+        )