Fix import hook warnings for Python 3.10+. (#437)

* Fix import hook warnings for py310.

* [Mega-Linter] Apply linters fixes

* Trigger test run.

Co-authored-by: TimPansino <[email protected]>
Co-authored-by: Uma Annamalai <[email protected]>

Author: TimPansino

newrelic/api/import_hook.py

@@ -162,17 +162,32 @@ def load_module(self, fullname):
         module = self.loader.load_module(fullname)
 
         # Call the import hooks on the module being handled.
-
         _notify_import_hooks(fullname, module)
 
         return module
 
+    def create_module(self, spec):
+        return self.loader.create_module(spec)
+
+    def exec_module(self, module):
+        self.loader.exec_module(module)
+
+        # Call the import hooks on the module being handled.
+        _notify_import_hooks(module.__name__, module)
+
 
 class ImportHookFinder:
     def __init__(self):
         self._skip = {}
 
     def find_module(self, fullname, path=None):
+        """
+        Find spec and patch import hooks into loader before returning.
+
+        Required for Python 2.
+
+        https://docs.python.org/3/library/importlib.html#importlib.abc.MetaPathFinder.find_module
+        """
 
         # If not something we are interested in we can return.
 
@@ -200,7 +215,7 @@ def find_module(self, fullname, path=None):
                 spec = find_spec(fullname)
                 loader = getattr(spec, "loader", None)
 
-                if loader:
+                if loader and not isinstance(loader, (_ImportHookChainedLoader, _ImportHookLoader)):
                     return _ImportHookChainedLoader(loader)
 
             else:
@@ -216,6 +231,54 @@ def find_module(self, fullname, path=None):
         finally:
             del self._skip[fullname]
 
+    def find_spec(self, fullname, path=None, target=None):
+        """
+        Find spec and patch import hooks into loader before returning.
+
+        Required for Python 3.10+ to avoid warnings.
+
+        https://docs.python.org/3/library/importlib.html#importlib.abc.MetaPathFinder.find_spec
+        """
+        # raise ValueError((name, path, target))
+
+        # If not something we are interested in we can return.
+
+        if fullname not in _import_hooks:
+            return None
+
+        # Check whether this is being called on the second time
+        # through and return.
+
+        if fullname in self._skip:
+            return None
+
+        # We are now going to call back into import. We set a
+        # flag to see we are handling the module so that check
+        # above drops out on subsequent pass and we don't go
+        # into an infinite loop.
+
+        self._skip[fullname] = True
+
+        try:
+            # For Python 3 we need to use find_spec() from the importlib
+            # module.
+
+            if find_spec:
+                spec = find_spec(fullname)
+                loader = getattr(spec, "loader", None)
+
+                if loader and not isinstance(loader, (_ImportHookChainedLoader, _ImportHookLoader)):
+                    spec.loader = _ImportHookChainedLoader(loader)
+
+                return spec
+
+            else:
+                # Not possible, Python 3 defines find_spec and Python 2 does not have find_spec on Finders
+                return None
+
+        finally:
+            del self._skip[fullname]
+
 
 def import_hook(name):
     def decorator(wrapped):