Fix SDK

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

@@ -19,11 +19,11 @@
 from functools import wraps
 from os import environ
 from sys import version_info
-from opentelemetry.util._entry_points import entry_points
 
 # pylint: disable=wrong-import-position
 from opentelemetry.context.context import Context
 from opentelemetry.environment_variables import OTEL_PYTHON_CONTEXT
+from opentelemetry.util._entry_points import entry_points
 
 logger = logging.getLogger(__name__)
 _RUNTIME_CONTEXT = None  # type: typing.Optional[_RuntimeContext]

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

@@ -78,7 +78,6 @@ def example_route():
 from opentelemetry.propagators import composite, textmap
 from opentelemetry.util._entry_points import entry_points
 
-
 logger = getLogger(__name__)
 
 

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

@@ -17,8 +17,8 @@
 # FIXME remove this file when support for 3.7 is dropped.
 if version_info.minor == 7:
     # pylint: disable=import-error
-    from importlib_metadata import entry_points  # type: ignore
+    from importlib_metadata import entry_points, version  # type: ignore
 else:
-    from importlib.metadata import entry_points
+    from importlib.metadata import entry_points, version
 
-__all__ = ["entry_points"]
+__all__ = ["entry_points", "version"]

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

@@ -16,6 +16,7 @@
 from os import environ
 from sys import version_info
 from typing import TYPE_CHECKING, TypeVar, cast
+
 from opentelemetry.util._entry_points import entry_points
 
 if TYPE_CHECKING:

opentelemetry-api/tests/util/test__providers.py

@@ -22,7 +22,6 @@
 
 
 class Test_Providers(TestCase):
-
     @patch.dict(
         environ,
         {  # type: ignore

opentelemetry-api/tests/util/test_re.py

@@ -63,7 +63,9 @@ def test_parse_env_headers(self):
             headers, expected, warn = case_
             if warn:
                 with self.assertLogs(level="WARNING") as cm:
-                    self.assertEqual(parse_env_headers(headers), dict(expected))
+                    self.assertEqual(
+                        parse_env_headers(headers), dict(expected)
+                    )
                     self.assertTrue(
                         "Header format invalid! Header values in environment "
                         "variables must be URL encoded per the OpenTelemetry "

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -57,13 +57,7 @@
 from opentelemetry.sdk.trace.sampling import Sampler
 from opentelemetry.semconv.resource import ResourceAttributes
 from opentelemetry.trace import set_tracer_provider
-
-# FIXME remove when support for 3.7 is dropped.
-if version_info.minor == 7:
-    # pylint: disable=import-error
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
+from opentelemetry.util._entry_points import entry_points
 
 _EXPORTER_OTLP = "otlp"
 _EXPORTER_OTLP_PROTO_GRPC = "otlp_proto_grpc"
@@ -100,21 +94,8 @@ def _import_config_components(
 
     component_implementations = []
 
-    # FIXME remove when support for 3.7 is dropped.
-    if version_info.minor == 7:
-
-        for entry_point in entry_points():
-            for selected_component in selected_components:
-                if (
-                    entry_point.name == selected_component
-                    and entry_point.group == entry_point_name
-                ):
-                    component_implementations.append(
-                        (selected_component, entry_point.load())
-                    )
-
     # FIXME remove when support for 3.9 is dropped.
-    elif version_info.minor <= 9:
+    if version_info.minor in (8, 9):
 
         for entry_point in entry_points()[entry_point_name]:
             for selected_component in selected_components:
@@ -128,9 +109,13 @@ def _import_config_components(
             component_implementations.append(
                 (
                     selected_component,
-                    entry_points(
-                        group=entry_point_name, name=selected_component
-                    )[0].load(),
+                    next(
+                        iter(
+                            entry_points(
+                                group=entry_point_name, name=selected_component
+                            )
+                        )
+                    ).load(),
                 )
             )
 

opentelemetry-sdk/src/opentelemetry/sdk/error_handler/__init__.py

@@ -63,12 +63,7 @@ def _handle(self, error: Exception, *args, **kwargs):
 from logging import getLogger
 from sys import version_info
 
-# FIXME remove when support for 3.7 is dropped.
-if version_info.minor == 7:
-    # pylint: disable=import-error
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
+from opentelemetry.util._entry_points import entry_points
 
 logger = getLogger(__name__)
 
@@ -125,7 +120,7 @@ def __exit__(self, exc_type, exc_value, traceback):
         plugin_handled = False
 
         # FIXME remove when support for 3.9 is dropped.
-        if version_info.minor <= 9:
+        if version_info.minor in (8, 9):
 
             error_handler_entry_points = entry_points()[
                 "opentelemetry_error_handler"

opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py

@@ -63,23 +63,16 @@
 import typing
 from json import dumps
 from urllib import parse
-from sys import version_info
 
 from opentelemetry.attributes import BoundedAttributes
 from opentelemetry.sdk.environment_variables import (
     OTEL_RESOURCE_ATTRIBUTES,
     OTEL_SERVICE_NAME,
 )
 from opentelemetry.semconv.resource import ResourceAttributes
+from opentelemetry.util._entry_points import version
 from opentelemetry.util.types import AttributeValue
 
-# FIXME remove when support for 3.7 is dropped.
-if version_info.minor == 7:
-    # pylint: disable=import-error
-    from importlib_metadata import version
-else:
-    from importlib.metadata import version
-
 LabelValue = AttributeValue
 Attributes = typing.Dict[str, LabelValue]
 logger = logging.getLogger(__name__)

opentelemetry-sdk/tests/error_handler/test_error_handler.py

@@ -56,7 +56,7 @@ class AssertionErrorHandler(ErrorHandler, AssertionError):
         )
 
         # FIXME remove when support for 3.9 is dropped.
-        if version_info.minor <= 9:
+        if version_info.minor in (8, 9):
 
             mock_entry_points.configure_mock(
                 **{
@@ -109,7 +109,7 @@ def _handle(self, error: Exception):
         )
 
         # FIXME remove when support for 3.9 is dropped.
-        if version_info.minor <= 9:
+        if version_info.minor in (8, 9):
 
             mock_entry_points.configure_mock(
                 **{
@@ -149,7 +149,7 @@ def __new__(cls):
         )
 
         # FIXME remove when support for 3.9 is dropped.
-        if version_info.minor <= 9:
+        if version_info.minor in (8, 9):
 
             mock_entry_points.configure_mock(
                 **{