keep original behavior and make exception accessible via flag

Author: rjduffner

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py

@@ -71,7 +71,9 @@ def _load_instrumentors(distro):
             continue
 
         try:
-            distro.load_instrumentor(entry_point)
+            distro.load_instrumentor(
+                entry_point, raise_exception_on_conflict=True
+            )
             _logger.debug("Instrumented %s", entry_point.name)
         except DependencyConflictError as exc:
             _logger.debug(

opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py

@@ -105,11 +105,16 @@ def instrument(self, **kwargs: Any):
 
         # 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)
-                raise DependencyConflictError(conflict)
+                if raise_exception_on_conflict:
+                    raise DependencyConflictError(conflict)
+                return None
 
         # initialize semantic conventions opt-in if needed
         _OpenTelemetrySemanticConventionStability._initialize()