Merge branch 'v3.x-dev' into gaaguiar/remove_azure_init

Author: gavin-aguiar

azure_functions_worker/dispatcher.py

@@ -34,7 +34,7 @@
 from .logging import disable_console_logging, enable_console_logging
 from .logging import enable_debug_logging_recommendation
 from .logging import (logger, error_logger, is_system_log_category,
-                      CONSOLE_LOG_PREFIX)
+                      CONSOLE_LOG_PREFIX, format_exception)
 from .utils.common import get_app_setting, is_envvar_true
 from .utils.dependency import DependencyManager
 from .utils.tracing import marshall_exception_trace
@@ -696,7 +696,9 @@ def gen(resp_queue):
             if ex is grpc_req_stream:
                 # Yes, this is how grpc_req_stream iterator exits.
                 return
-            error_logger.exception('unhandled error in gRPC thread')
+            error_logger.exception(
+                'unhandled error in gRPC thread. Exception: {0}'.format(
+                    format_exception(ex)))
             raise
 
 

azure_functions_worker/logging.py

@@ -4,6 +4,7 @@
 from typing import Optional
 import logging
 import logging.handlers
+import traceback
 import sys
 
 # Logging Prefixes
@@ -20,6 +21,13 @@
 error_handler: Optional[logging.Handler] = None
 
 
+def format_exception(exception):
+    msg = str(exception) + "\n"
+    msg += ''.join(traceback.format_exception(
+        etype=type(exception), value=exception, tb=exception.__traceback__))
+    return msg
+
+
 def setup(log_level, log_destination):
     # Since handler and error_handler are moved to the global scope,
     # before assigning to these handlers, we should define 'global' keyword

azure_functions_worker/main.py

@@ -36,20 +36,21 @@ def main():
 
     from . import logging
     from ._thirdparty import aio_compat
-    from .logging import error_logger, logger
+    from .logging import error_logger, logger, format_exception
 
     args = parse_args()
     logging.setup(log_level=args.log_level, log_destination=args.log_to)
-
-    logger.info('Starting Azure Functions Python Worker.')
-    logger.info('Worker ID: %s, Request ID: %s, Host Address: %s:%s',
+    logger.info('Starting Azure Functions Python Worker. \n'
+                'Worker ID: %s, Request ID: %s, Host Address: %s:%s',
                 args.worker_id, args.request_id, args.host, args.port)
 
     try:
         return aio_compat.run(start_async(
             args.host, args.port, args.worker_id, args.request_id))
-    except Exception:
-        error_logger.exception('unhandled error in functions worker')
+    except Exception as ex:
+        error_logger.exception(
+            'unhandled error in functions worker: {0}'.format(
+                format_exception(ex)))
         raise
 
 

setup.py

@@ -112,7 +112,7 @@
     "grpcio~=1.43.0",
     "grpcio-tools~=1.43.0",
     "protobuf~=3.19.3",
-    "azure-functions==1.10.1"
+    "azure-functions==1.11.3b2"
 ]
 
 

tests/endtoend/test_cosmosdb_functions.py

@@ -35,10 +35,13 @@ def test_cosmosdb_trigger(self):
                 response = r.json()
                 response.pop('_metadata', None)
 
-                self.assertEqual(
-                    response,
-                    doc
-                )
+                self.assertEqual(response['id'], doc['id'])
+                self.assertEqual(response['data'], doc['data'])
+                self.assertTrue('_etag' in response)
+                self.assertTrue('_lsn' in response)
+                self.assertTrue('_rid' in response)
+                self.assertTrue('_self' in response)
+                self.assertTrue('_ts' in response)
             except AssertionError:
                 if try_no == max_retries - 1:
                     raise
@@ -67,10 +70,14 @@ def test_cosmosdb_input(self):
                 self.assertEqual(r.status_code, 200)
                 response = r.json()
 
-                self.assertEqual(
-                    response,
-                    doc
-                )
+                # _lsn is present for cosmosdb change feed only,
+                # ref https://aka.ms/cosmos-change-feed
+                self.assertEqual(response['id'], doc['id'])
+                self.assertEqual(response['data'], doc['data'])
+                self.assertTrue('_etag' in response)
+                self.assertTrue('_rid' in response)
+                self.assertTrue('_self' in response)
+                self.assertTrue('_ts' in response)
             except AssertionError:
                 if try_no == max_retries - 1:
                     raise

tests/endtoend/test_dependency_isolation_functions.py

@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 import os
 import importlib.util
+from unittest import skip
 from unittest.case import skipIf
 from unittest.mock import patch
 
@@ -128,6 +129,7 @@ def test_loading_libraries_from_customers_package(self):
         )
 
 
+@skip("Skipping dependency isolation test for dedicated. Needs investigation")
 class TestOlderVersionOfAzFuncDependencyIsolationOnDedicated(
         testutils.WebHostTestCase):
     """Test the dependency manager E2E scenario via Http Trigger.
@@ -176,6 +178,7 @@ def test_loading_libraries_from_customers_package(self):
             self.expected_azfunc_version, libraries['func.version'])
 
 
+@skip("Skipping dependency isolation test for dedicated. Needs investigation")
 class TestNewerVersionOfAzFuncDependencyIsolationOnDedicated(
         testutils.WebHostTestCase):
     """Test the dependency manager E2E scenario via Http Trigger.