Enabled dependency isolation by default

Author: gavin-aguiar

azure_functions_worker/constants.py

@@ -43,8 +43,7 @@
 PYTHON_THREADPOOL_THREAD_COUNT_MAX = sys.maxsize
 PYTHON_THREADPOOL_THREAD_COUNT_MAX_37 = 32
 
-PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT = False
-PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT_310 = False
+PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT = True
 PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT = False
 PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT_39 = True
 

azure_functions_worker/loader.py

@@ -147,7 +147,8 @@ def index_function_app(function_path: str) -> List[Function]:
 
     app: Optional[FunctionApp] = None
     for i in imported_module.__dir__():
-        if isinstance(getattr(imported_module, i, None), FunctionApp):
+        if type(getattr(imported_module, i,
+                        None)).__name__ == FunctionApp.__name__:
             if not app:
                 app = getattr(imported_module, i, None)
             else:

azure_functions_worker/utils/dependency.py

@@ -1,21 +1,19 @@
-from azure_functions_worker.utils.common import is_true_like
-from typing import List, Optional
-from types import ModuleType
 import importlib
 import inspect
 import os
 import re
 import sys
+from types import ModuleType
+from typing import List, Optional
 
-from ..logging import logger
+from azure_functions_worker.utils.common import is_true_like
 from ..constants import (
     AZURE_WEBJOBS_SCRIPT_ROOT,
     CONTAINER_NAME,
     PYTHON_ISOLATE_WORKER_DEPENDENCIES,
-    PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT,
-    PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT_310
+    PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT
 )
-from ..utils.common import is_python_version
+from ..logging import logger
 from ..utils.wrappers import enable_feature_by
 
 
@@ -75,12 +73,7 @@ def is_in_linux_consumption(cls):
     @classmethod
     @enable_feature_by(
         flag=PYTHON_ISOLATE_WORKER_DEPENDENCIES,
-        flag_default=(
-            PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT_310 if
-            is_python_version('3.10') else
-            PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT
-        )
-    )
+        flag_default=PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT)
     def use_worker_dependencies(cls):
         """Switch the sys.path and ensure the worker imports are loaded from
         Worker's dependenciess.
@@ -106,12 +99,7 @@ def use_worker_dependencies(cls):
     @classmethod
     @enable_feature_by(
         flag=PYTHON_ISOLATE_WORKER_DEPENDENCIES,
-        flag_default=(
-            PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT_310 if
-            is_python_version('3.10') else
-            PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT
-        )
-    )
+        flag_default=PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT)
     def prioritize_customer_dependencies(cls, cx_working_dir=None):
         """Switch the sys.path and ensure the customer's code import are loaded
         from CX's deppendencies.
@@ -180,11 +168,7 @@ def reload_customer_libraries(cls, cx_working_dir: str):
         """
         use_new_env = os.getenv(PYTHON_ISOLATE_WORKER_DEPENDENCIES)
         if use_new_env is None:
-            use_new = (
-                PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT_310 if
-                is_python_version('3.10') else
-                PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT
-            )
+            use_new = PYTHON_ISOLATE_WORKER_DEPENDENCIES_DEFAULT
         else:
             use_new = is_true_like(use_new_env)