Use importlib-metadata regardless of Python version

Fixes open-telemetry#3167

Author: ocelotl

opentelemetry-api/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
     "Deprecated >= 1.2.6",
     "setuptools >= 16.0",
-    "importlib-metadata >= 5.0.0; python_version=='3.7'"
+    "importlib-metadata >= 5.0.0",
 ]
 dynamic = [
     "version",

opentelemetry-api/src/opentelemetry/propagate/__init__.py

@@ -137,7 +137,7 @@ def inject(
         propagators.append(  # type: ignore
             next(  # type: ignore
                 iter(  # type: ignore
-                    entry_points(  # type: ignore
+                    entry_points(  #  type: ignore
                         group="opentelemetry_propagator",
                         name=propagator,
                     )

opentelemetry-api/src/opentelemetry/util/_importlib_metadata.py

@@ -12,27 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sys import version_info
+from importlib_metadata import (  # type: ignore
+    EntryPoint,
+    EntryPoints,
+    entry_points,
+    version,
+)
 
-# FIXME remove this when support for 3.7 is dropped.
-if version_info.minor == 7:
-    # pylint: disable=import-error
-    from importlib_metadata import entry_points, version  # type: ignore
+# The importlib-metadata library has introduced breaking changes before to its
+# API, this module is kept just to act as a layer between the
+# importlib-metadata library and our project if in any case it is necessary to
+# do so.
 
-# FIXME remove this file when support for 3.9 is dropped.
-elif version_info.minor in (8, 9):
-    # pylint: disable=import-error
-    from importlib.metadata import (
-        entry_points as importlib_metadata_entry_points,
-    )
-    from importlib.metadata import version
-
-    def entry_points(group: str, name: str):  # type: ignore
-        for entry_point in importlib_metadata_entry_points()[group]:
-            if entry_point.name == name:
-                yield entry_point
-
-else:
-    from importlib.metadata import entry_points, version
-
-__all__ = ["entry_points", "version"]
+__all__ = ["entry_points", "version", "EntryPoint", "EntryPoints"]

opentelemetry-api/tests/util/test__importlib_metadata.py

@@ -15,7 +15,10 @@
 from unittest import TestCase
 
 from opentelemetry.metrics import MeterProvider
-from opentelemetry.util._importlib_metadata import entry_points
+from opentelemetry.util._importlib_metadata import EntryPoint, EntryPoints
+from opentelemetry.util._importlib_metadata import (
+    entry_points as importlib_metadata_entry_points,
+)
 
 
 class TestEntryPoints(TestCase):
@@ -24,11 +27,82 @@ def test_entry_points(self):
         self.assertIsInstance(
             next(
                 iter(
-                    entry_points(
+                    importlib_metadata_entry_points(
                         group="opentelemetry_meter_provider",
                         name="default_meter_provider",
                     )
                 )
             ).load()(),
             MeterProvider,
         )
+
+    def test_uniform_behavior(self):
+        """
+        Test that entry_points behaves the same regardless of the Python
+        version.
+        """
+
+        entry_points = importlib_metadata_entry_points()
+
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_points = entry_points.select(group="opentelemetry_propagator")
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_points = entry_points.select(name="baggage")
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_point = next(iter(entry_points))
+        self.assertIsInstance(entry_point, EntryPoint)
+
+        self.assertEqual(entry_point.name, "baggage")
+        self.assertEqual(entry_point.group, "opentelemetry_propagator")
+        self.assertEqual(
+            entry_point.value,
+            "opentelemetry.baggage.propagation:W3CBaggagePropagator",
+        )
+
+        entry_points = importlib_metadata_entry_points(
+            group="opentelemetry_propagator"
+        )
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_points = entry_points.select(name="baggage")
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_point = next(iter(entry_points))
+        self.assertIsInstance(entry_point, EntryPoint)
+
+        self.assertEqual(entry_point.name, "baggage")
+        self.assertEqual(entry_point.group, "opentelemetry_propagator")
+        self.assertEqual(
+            entry_point.value,
+            "opentelemetry.baggage.propagation:W3CBaggagePropagator",
+        )
+
+        entry_points = importlib_metadata_entry_points(name="baggage")
+        self.assertIsInstance(entry_points, EntryPoints)
+
+        entry_point = next(iter(entry_points))
+        self.assertIsInstance(entry_point, EntryPoint)
+
+        self.assertEqual(entry_point.name, "baggage")
+        self.assertEqual(entry_point.group, "opentelemetry_propagator")
+        self.assertEqual(
+            entry_point.value,
+            "opentelemetry.baggage.propagation:W3CBaggagePropagator",
+        )
+
+        entry_points = importlib_metadata_entry_points(group="abc")
+        self.assertIsInstance(entry_points, EntryPoints)
+        self.assertEqual(len(entry_points), 0)
+
+        entry_points = importlib_metadata_entry_points(
+            group="opentelemetry_propagator", name="abc"
+        )
+        self.assertIsInstance(entry_points, EntryPoints)
+        self.assertEqual(len(entry_points), 0)
+
+        entry_points = importlib_metadata_entry_points(group="abc", name="abc")
+        self.assertIsInstance(entry_points, EntryPoints)
+        self.assertEqual(len(entry_points), 0)