lint

Author: jeremydvoss

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

@@ -40,7 +40,6 @@
 )
 from opentelemetry.instrumentation.dependencies import (
     DependencyConflict,
-    DependencyConflictError,
 )
 from opentelemetry.sdk.metrics.export import (
     HistogramDataPoint,
@@ -1116,7 +1115,7 @@ def test_instruments_with_old_fastapi_installed(
         #     dependency_conflict
         # )
         # TODO: return conflict instead of raising
-        mock_dep.return_value = DependencyConflictError(dependency_conflict)
+        mock_dep.return_value = dependency_conflict
         _load_instrumentors(mock_distro)
         mock_distro.load_instrumentor.assert_not_called()
         self.assertEqual(
@@ -1151,7 +1150,7 @@ def test_instruments_without_fastapi_installed(
         # mock_distro.load_instrumentor.side_effect = DependencyConflictError(
         #     dependency_conflict
         # )
-        mock_dep.return_value = DependencyConflictError(dependency_conflict)
+        mock_dep.return_value = dependency_conflict
         _load_instrumentors(mock_distro)
         mock_distro.load_instrumentor.assert_not_called()
         self.assertEqual(

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

@@ -104,7 +104,7 @@ def _load_instrumentors(distro):
             entry_point_dist = entry_point_finder.dist_for(entry_point)
             conflict = get_dist_dependency_conflicts(entry_point_dist)
             if conflict:
-                print("conflict found %s: %s" % (entry_point.name, conflict))
+                # print("conflict found %s: %s" % (entry_point.name, conflict))
                 _logger.debug(
                     "Skipping instrumentation %s: %s",
                     entry_point.name,
@@ -115,7 +115,7 @@ 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)
-            print("Instrumented %s" % entry_point.name)
+            # print("Instrumented %s" % entry_point.name)
         # except DependencyConflictError as exc:
         #     print(
         #         "Skipping instrumentation %s: %s" % (
@@ -147,15 +147,15 @@ def _load_instrumentors(distro):
             # 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
-            print(
-                "Skipping instrumentation %s: ImportError" % entry_point.name
-            )
+            # print(
+            #     "Skipping instrumentation %s: ImportError" % entry_point.name
+            # )
             _logger.exception(
                 "Importing of %s failed, skipping it", entry_point.name
             )
             continue
         except Exception as exc:  # pylint: disable=broad-except
-            print("Skipping instrumentation %s: %s" % (entry_point.name, exc))
+            # print("Skipping instrumentation %s: %s" % (entry_point.name, exc))
             _logger.exception("Instrumenting of %s failed", entry_point.name)
             raise exc