load_distro

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

@@ -31,7 +31,7 @@
 _logger = getLogger(__name__)
 
 
-def _load_distros() -> BaseDistro:
+def _load_distro() -> BaseDistro:
     distro_name = environ.get(OTEL_PYTHON_DISTRO, None)
     for entry_point in iter_entry_points("opentelemetry_distro"):
         try:

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

@@ -18,7 +18,7 @@
 
 from opentelemetry.instrumentation.auto_instrumentation._load import (
     _load_configurators,
-    _load_distros,
+    _load_distro,
     _load_instrumentors,
 )
 from opentelemetry.instrumentation.utils import _python_path_without_directory
@@ -33,7 +33,7 @@ def initialize():
     )
 
     try:
-        distro = _load_distros()
+        distro = _load_distro()
         distro.configure()
         _load_configurators()
         _load_instrumentors(distro)

opentelemetry-instrumentation/tests/auto_instrumentation/test_load.py

@@ -102,7 +102,7 @@ def test_load_configurators_error(self, iter_mock):
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
     )
-    def test_load_distros(self, iter_mock, isinstance_mock):
+    def test_load_distro(self, iter_mock, isinstance_mock):
         # Add multiple entry points but only specify the 2nd in the environment variable.
         ep_mock1 = Mock()
         ep_mock1.name = "custom_distro1"
@@ -121,7 +121,7 @@ def test_load_distros(self, iter_mock, isinstance_mock):
         # Mock entry points to be instances of BaseDistro.
         isinstance_mock.return_value = True
         self.assertEqual(
-            _load._load_distros(),
+            _load._load_distro(),
             distro_mock2(),
         )
 
@@ -135,7 +135,7 @@ def test_load_distros(self, iter_mock, isinstance_mock):
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
     )
-    def test_load_distros_not_distro(
+    def test_load_distro_not_distro(
         self, iter_mock, default_distro_mock, isinstance_mock
     ):
         # Add multiple entry points but only specify the 2nd in the environment variable.
@@ -156,7 +156,7 @@ def test_load_distros_not_distro(
         # Confirm default distro is used if specified entry point is not a BaseDistro
         isinstance_mock.return_value = False
         self.assertEqual(
-            _load._load_distros(),
+            _load._load_distro(),
             default_distro_mock(),
         )
 
@@ -167,11 +167,11 @@ def test_load_distros_not_distro(
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
     )
-    def test_load_distros_no_ep(self, iter_mock, default_distro_mock):
+    def test_load_distro_no_ep(self, iter_mock, default_distro_mock):
         iter_mock.return_value = ()
         # Confirm default distro is used if there are no entry points.
         self.assertEqual(
-            _load._load_distros(),
+            _load._load_distro(),
             default_distro_mock(),
         )
 
@@ -182,7 +182,7 @@ def test_load_distros_no_ep(self, iter_mock, default_distro_mock):
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
     )
-    def test_load_distros_error(self, iter_mock, isinstance_mock):
+    def test_load_distro_error(self, iter_mock, isinstance_mock):
         ep_mock1 = Mock()
         ep_mock1.name = "custom_distro1"
         distro_mock1 = Mock()
@@ -200,7 +200,7 @@ def test_load_distros_error(self, iter_mock, isinstance_mock):
         iter_mock.return_value = (ep_mock1, ep_mock2, ep_mock3)
         isinstance_mock.return_value = True
         # Confirm method raises exception if it fails to load a distro.
-        self.assertRaises(Exception, _load._load_distros)
+        self.assertRaises(Exception, _load._load_distro)
 
     @patch.dict(
         "os.environ",