rename

Author: lzchen

azure_functions_worker/dispatcher.py

@@ -102,7 +102,7 @@ def __init__(self, loop: BaseEventLoop, host: str, port: int,
         self._function_metadata_exception = None
 
         # Used for checking if open telemetry is enabled
-        self._otel_libs_available = False
+        self._azure_monitor_available = False
         self._context_api = None
         self._trace_context_propagator = None
 
@@ -291,7 +291,7 @@ async def _dispatch_grpc_request(self, request):
         resp = await request_handler(request)
         self._grpc_resp_queue.put_nowait(resp)
 
-    def initialize_opentelemetry(self):
+    def initialize_azure_monitor(self):
         """Initializes OpenTelemetry and Azure monitor distro
         """
         self.update_opentelemetry_status()
@@ -317,19 +317,19 @@ def initialize_opentelemetry(self):
                     default_value=PYTHON_AZURE_MONITOR_LOGGER_NAME_DEFAULT
                 ),
             )
-            self._otel_libs_available = True
+            self._azure_monitor_available = True
 
             logger.info("Successfully configured Azure monitor distro.")
         except ImportError:
             logger.exception(
                 "Cannot import Azure Monitor distro."
             )
-            self._otel_libs_available = False
+            self._azure_monitor_available = False
         except Exception:
             logger.exception(
                 "Error initializing Azure monitor distro."
             )
-            self._otel_libs_available = False
+            self._azure_monitor_available = False
 
     def update_opentelemetry_status(self):
         """Check for OpenTelemetry library availability and
@@ -342,12 +342,11 @@ def update_opentelemetry_status(self):
 
             self._context_api = context_api
             self._trace_context_propagator = TraceContextTextMapPropagator()
-            self._otel_libs_available = True
 
             logger.info("Successfully loaded OpenTelemetry modules. "
                         "OpenTelemetry is now enabled.")
         except ImportError:
-            self._otel_libs_available = False
+            self._azure_monitor_available = False
 
     async def _handle__worker_init_request(self, request):
         logger.info('Received WorkerInitRequest, '
@@ -379,9 +378,9 @@ async def _handle__worker_init_request(self, request):
         }
         if get_app_setting(setting=PYTHON_ENABLE_OPENTELEMETRY,
                            default_value=PYTHON_ENABLE_OPENTELEMETRY_DEFAULT):
-            self.initialize_opentelemetry()
+            self.initialize_azure_monitor()
 
-            if self._otel_libs_available:
+            if self._azure_monitor_available:
                 capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = _TRUE
 
         if DependencyManager.should_load_cx_dependencies():
@@ -653,7 +652,7 @@ async def _handle__invocation_request(self, request):
                     args[name] = bindings.Out()
 
             if fi.is_async:
-                if self._otel_libs_available:
+                if self._azure_monitor_available:
                     self.configure_opentelemetry(fi_context)
 
                 call_result = \
@@ -773,9 +772,9 @@ async def _handle__function_environment_reload_request(self, request):
             if get_app_setting(
                     setting=PYTHON_ENABLE_OPENTELEMETRY,
                     default_value=PYTHON_ENABLE_OPENTELEMETRY_DEFAULT):
-                self.update_opentelemetry_status()
+                self.initialize_azure_monitor()
 
-                if self._otel_libs_available:
+                if self._azure_monitor_available:
                     capabilities[constants.WORKER_OPEN_TELEMETRY_ENABLED] = (
                         _TRUE)
 
@@ -986,7 +985,7 @@ def _run_sync_func(self, invocation_id, context, func, params):
         # invocation_id from ThreadPoolExecutor's threads.
         context.thread_local_storage.invocation_id = invocation_id
         try:
-            if self._otel_libs_available:
+            if self._azure_monitor_available:
                 self.configure_opentelemetry(context)
             return ExtensionManager.get_sync_invocation_wrapper(context,
                                                                 func)(params)

tests/unittests/test_opentelemetry.py

@@ -23,37 +23,38 @@ def test_update_opentelemetry_status_import_error(self):
         with patch('builtins.__import__', side_effect=ImportError):
             self.dispatcher.update_opentelemetry_status()
             # Verify that otel_libs_available is set to False due to ImportError
-            self.assertFalse(self.dispatcher._otel_libs_available)
+            self.assertFalse(self.dispatcher._azure_monitor_available)
 
     @patch('builtins.__import__')
     def test_update_opentelemetry_status_success(
             self, mock_imports):
         mock_imports.return_value = MagicMock()
         self.dispatcher.update_opentelemetry_status()
-        self.assertTrue(self.dispatcher._otel_libs_available)
+        self.assertIsNotNone(self.dispatcher._context_api)
+        self.assertIsNotNone(self.dispatcher._trace_context_propagator)
 
     @patch('builtins.__import__')
     @patch("azure_functions_worker.dispatcher.Dispatcher.update_opentelemetry_status")
-    def test_initialize_opentelemetry_success(
+    def test_initialize_azure_monitor_success(
         self,
         mock_update_ot,
         mock_imports,
     ):
         mock_imports.return_value = MagicMock()
-        self.dispatcher.initialize_opentelemetry()
+        self.dispatcher.initialize_azure_monitor()
         mock_update_ot.assert_called_once()
-        self.assertTrue(self.dispatcher._otel_libs_available)
+        self.assertTrue(self.dispatcher._azure_monitor_available)
 
     @patch("azure_functions_worker.dispatcher.Dispatcher.update_opentelemetry_status")
-    def test_initialize_opentelemetry_import_error(
+    def test_initialize_azure_monitor_import_error(
         self,
         mock_update_ot,
     ):
         with patch('builtins.__import__', side_effect=ImportError):
-            self.dispatcher.initialize_opentelemetry()
+            self.dispatcher.initialize_azure_monitor()
             mock_update_ot.assert_called_once()
             # Verify that otel_libs_available is set to False due to ImportError
-            self.assertFalse(self.dispatcher._otel_libs_available)
+            self.assertFalse(self.dispatcher._azure_monitor_available)
 
     @patch("azure_functions_worker.dispatcher.get_app_setting")
     @patch('builtins.__import__')
@@ -83,12 +84,12 @@ def test_init_request_otel_capability_enabled_app_setting(
         self.assertIn("WorkerOpenTelemetryEnabled", capabilities)
         self.assertEqual(capabilities["WorkerOpenTelemetryEnabled"], "true")
 
-    @patch("azure_functions_worker.dispatcher.Dispatcher.initialize_opentelemetry")
+    @patch("azure_functions_worker.dispatcher.Dispatcher.initialize_azure_monitor")
     @patch("azure_functions_worker.dispatcher.get_app_setting")
     def test_init_request_otel_capability_disabled_app_setting(
         self,
         mock_app_setting,
-        mock_initialize_ot,
+        mock_initialize_azmon,
     ):
         mock_app_setting.return_value = False
 
@@ -105,8 +106,8 @@ def test_init_request_otel_capability_disabled_app_setting(
         self.assertEqual(init_response.worker_init_response.result.status,
                          protos.StatusResult.Success)
 
-        # OpenTelemetry initialized not called
-        mock_initialize_ot.assert_not_called()
+        # Azure monitor initialized not called
+        mock_initialize_azmon.assert_not_called()
 
         # Verify that WorkerOpenTelemetryEnabled capability is not set
         capabilities = init_response.worker_init_response.capabilities