Minimize test changes

Author: jeremydvoss

instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py

@@ -1101,7 +1101,6 @@ def test_instruments_with_fastapi_installed(self, mock_logger):
             [self._instrumentation_loaded_successfully_call()]
         )
 
-    # TODO: fails
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
     )
@@ -1111,33 +1110,13 @@ def test_instruments_with_old_fastapi_installed(
     ):  # pylint: disable=no-self-use
         dependency_conflict = DependencyConflict("0.58", "0.57")
         mock_distro = Mock()
-        # mock_distro.load_instrumentor.side_effect = DependencyConflictError(
-        #     dependency_conflict
-        # )
-        # TODO: return conflict instead of raising
         mock_dep.return_value = dependency_conflict
         _load_instrumentors(mock_distro)
         mock_distro.load_instrumentor.assert_not_called()
-        self.assertEqual(
-            mock_logger.debug.call_args.args,
-            (
-                "Skipping instrumentation %s: %s",
-                "fastapi",
-                dependency_conflict,
-            ),
+        mock_logger.assert_has_calls(
+            [self._instrumentation_failed_to_load_call(dependency_conflict)]
         )
-        # self.assertEqual(len(mock_distro.load_instrumentor.call_args_list), 1)
-        # (ep,) = mock_distro.load_instrumentor.call_args.args
-        # self.assertEqual(ep.name, "fastapi")
-        # assert (
-        #     self._instrumentation_loaded_successfully_call()
-        #     not in mock_logger.debug.call_args_list
-        # )
-        # mock_logger.debug.assert_has_calls(
-        #     [self._instrumentation_failed_to_load_call(dependency_conflict)]
-        # )
-
-    # TODO: fails
+
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.get_dist_dependency_conflicts"
     )
@@ -1147,30 +1126,12 @@ def test_instruments_without_fastapi_installed(
     ):  # pylint: disable=no-self-use
         dependency_conflict = DependencyConflict("0.58", None)
         mock_distro = Mock()
-        # mock_distro.load_instrumentor.side_effect = DependencyConflictError(
-        #     dependency_conflict
-        # )
         mock_dep.return_value = dependency_conflict
         _load_instrumentors(mock_distro)
         mock_distro.load_instrumentor.assert_not_called()
-        self.assertEqual(
-            mock_logger.debug.call_args.args,
-            (
-                "Skipping instrumentation %s: %s",
-                "fastapi",
-                dependency_conflict,
-            ),
+        mock_logger.assert_has_calls(
+            [self._instrumentation_failed_to_load_call(dependency_conflict)]
         )
-        # self.assertEqual(len(mock_distro.load_instrumentor.call_args_list), 1)
-        # (ep,) = mock_distro.load_instrumentor.call_args.args
-        # self.assertEqual(ep.name, "fastapi")
-        # assert (
-        #     self._instrumentation_loaded_successfully_call()
-        #     not in mock_logger.debug.call_args_list
-        # )
-        # mock_logger.debug.assert_has_calls(
-        #     [self._instrumentation_failed_to_load_call(dependency_conflict)]
-        # )
 
     def _create_app(self):
         # instrumentation is handled by the instrument call

instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_instrumentation.py

@@ -146,7 +146,7 @@ def _instrumentation_loaded_successfully_call():
             return call("Instrumented %s", "psycopg2")
 
         mock_distro = Mock()
-        # TODO: This test previously did nothing. By mocking the distro, it blocks any possibility of a dependency conflict. Mocking no dependency conflict for no. But, in the future, update this package toml with the instruemnts_either field.
+        # TODO: This test previously did nothing. By mocking the distro, it blocked any possibility of a dependency conflict. Mocking no dependency conflict for no. But, in the future, update this package toml with the instruemnts_either field. See https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3610
         mock_dep.return_value = None
         mock_distro.load_instrumentor.return_value = None
         _load_instrumentors(mock_distro)