Disabling opentracing/log-correlation in order to eventually upgrade to latest twisted release and base off asyncio reactor for twisted.

Author: cboling-zz

README.rst

@@ -29,10 +29,16 @@ Installation instruction
 
 .. code:: bash
 
-   pip install pyvoltha-min
+   python -m pip install pyvoltha-min
 
 Release Notes
 -------------
+v2.8.1 (2022-09-21)
+^^^^^^^^^^^^^^^^^^^
+ - Disabling opentracing/log-correlation in order to eventually upgrade to latest
+   twisted release and base off asyncio reactor for twisted.
+ - Moving minimum python version to 3.8
+
 v2.8.0 (2022-02-01)
 ^^^^^^^^^^^^^^^^^^^
  - Pull in v2.8 (release) voltha-protos definitions and python generated code and

VERSION

@@ -1 +1 @@
-2.8.0
+2.8.1

pyvoltha_min/adapters/kafka/kafka_inter_container_library.py

@@ -682,7 +682,8 @@ def send_request(self, rpc, to_topic, reply_topic=None,   # pylint: disable=too-
                 async_span = None
 
             d = self.send_kafka_message(to_topic, request, async_span)
-
+            if d is not None:
+                return
             if self.tx_stats:
                 def successful(results, rpc_name, start):
                     # Update statistic at this level

pyvoltha_min/adapters/log_controller.py

@@ -58,8 +58,11 @@ def __init__(self, etcd_host, etcd_port, scope_manager, config, watch_callback=N
         self._global_log_level = GLOBAL_DEFAULT_LOGLEVEL
         self._watch_callback = watch_callback
 
-        # Reference
-        GlobalTracingSupport.set_log_controller(self, scope_manager, config)
+        # CB: 2022-09-21: Disabling tracing during transition phase of using the latest Twisted
+        #                 releases and asyncio as the base reactor. Once this is complete, a
+        #                 new major version of pyvoltha-min will be created with tracing re-enabled
+        # # Reference
+        # GlobalTracingSupport.set_log_controller(self, scope_manager, config)
 
     @staticmethod
     def make_component_path(component):
@@ -254,8 +257,14 @@ def persist_initial_log_features(self):
             # Return none always
 
     def enable_jaeger_client(self):
-        log_correlation_enabled = GlobalTracingSupport.log_correlation_status
-        tracing_enabled = GlobalTracingSupport.trace_publishing_status
+
+        # CB: 2022-09-21: Disabling tracing during transition phase of using the latest Twisted
+        #                 releases and asyncio as the base reactor. Once this is complete, a
+        #                 new major version of pyvoltha-min will be created with tracing re-enabled.
+        log_correlation_enabled = False
+        tracing_enabled = False
+        # log_correlation_enabled = GlobalTracingSupport.log_correlation_status
+        # tracing_enabled = GlobalTracingSupport.trace_publishing_status
 
         if tracing_enabled or log_correlation_enabled:
             # The following are available 'config' dictionary options

pyvoltha_min/adapters/log_features.py

@@ -38,14 +38,17 @@ def log_correlation_status(self, value):
         if not isinstance(value, bool):
             raise TypeError('Boolean required')
 
-        if value != self._log_correlation_enabled:
-            # Close any previous tracer and reopen if required
-            tracer = global_tracer()
-            if hasattr(tracer, 'close'):
-                tracer.close()
-
-            self._log_correlation_enabled = value
-            self._log_controller.enable_jaeger_client()
+        # CB: 2022-09-21: Disabling tracing during transition phase of using the latest Twisted
+        #                 releases and asyncio as the base reactor. Once this is complete, a
+        #                 new major version of pyvoltha-min will be created with tracing re-enabled.
+        # if value != self._log_correlation_enabled:
+        #     # Close any previous tracer and reopen if required
+        #     tracer = global_tracer()
+        #     if hasattr(tracer, 'close'):
+        #         tracer.close()
+        #
+        #     self._log_correlation_enabled = value
+        #     self._log_controller.enable_jaeger_client()
 
     @property
     def trace_publishing_status(self):
@@ -56,14 +59,17 @@ def trace_publishing_status(self, value):
         if not isinstance(value, bool):
             raise TypeError('Boolean required')
 
-        if value != self._trace_publishing_enabled:
-            # Close any previous tracer and reopen if required
-            tracer = global_tracer()
-            if hasattr(tracer, 'close'):
-                tracer.close()
-
-            self._trace_publishing_enabled = value
-            self._log_controller.enable_jaeger_client()
+        # CB: 2022-09-21: Disabling tracing during transition phase of using the latest Twisted
+        #                 releases and asyncio as the base reactor. Once this is complete, a
+        #                 new major version of pyvoltha-min will be created with tracing re-enabled.
+        # if value != self._trace_publishing_enabled:
+        #     # Close any previous tracer and reopen if required
+        #     tracer = global_tracer()
+        #     if hasattr(tracer, 'close'):
+        #         tracer.close()
+        #
+        #     self._trace_publishing_enabled = value
+        #     self._log_controller.enable_jaeger_client()
 
     @property
     def component_name(self):
@@ -88,10 +94,16 @@ def set_log_controller(self, log_controller, scope_manager, config):
         self._component_name = config.get('component_name', os.environ.get('COMPONENT_NAME',
                                                                            'unknown-olt'))
         self.scope_manager = scope_manager
-        # Set trace/log correlation directly.  During initial startup, we want to start the
-        # OpenTracing client at the end of our init and not from the property setter functions.
-        self._trace_publishing_enabled = config.get('trace_enabled')
-        self._log_correlation_enabled = config.get('log_correlation_enabled')
+        # CB: 2022-09-21: Disabling tracing during transition phase of using the latest Twisted
+        #                 releases and asyncio as the base reactor. Once this is complete, a
+        #                 new major version of pyvoltha-min will be created with tracing re-enabled.
+        self._trace_publishing_enabled = False
+        self._log_correlation_enabled = False
+
+        # # Set trace/log correlation directly.  During initial startup, we want to start the
+        # # OpenTracing client at the end of our init and not from the property setter functions.
+        # self._trace_publishing_enabled = config.get('trace_enabled')
+        # self._log_correlation_enabled = config.get('log_correlation_enabled')
 
 
 GlobalTracingSupport = _LogFeatures()