Remove trace class (#39)

Author: liyanhui1228

trace/opencensus/trace/__init__.py

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from opencensus.trace.trace import Trace
 from opencensus.trace.span import Span
 
 
-__all__ = ['Trace', 'Span']
+__all__ = ['Span']

trace/opencensus/trace/ext/django/middleware.py

@@ -146,8 +146,6 @@ def process_request(self, request):
                 exporter=self.exporter,
                 propagator=self.propagator)
 
-            tracer.start_trace()
-
             # Span name is being set at process_view
             tracer.start_span()
             tracer.add_label_to_spans(
@@ -182,7 +180,7 @@ def process_response(self, request, response):
             _set_django_labels(tracer, request)
 
             tracer.end_span()
-            tracer.end_trace()
+            tracer.finish()
         except Exception:  # pragma: NO COVER
             log.error('Failed to trace request', exc_info=True)
         finally:

trace/opencensus/trace/ext/flask/flask_middleware.py

@@ -84,8 +84,6 @@ def _before_request(self):
                 exporter=self.exporter,
                 propagator=self.propagator)
 
-            tracer.start_trace()
-
             span = tracer.start_span()
 
             # Set the span name as the name of the current module name
@@ -109,7 +107,7 @@ def _after_request(self, response):
                 str(response.status_code))
 
             tracer.end_span()
-            tracer.end_trace()
+            tracer.finish()
         except Exception:  # pragma: NO COVER
             log.error('Failed to trace request', exc_info=True)
         finally:

trace/opencensus/trace/request_tracer.py

@@ -88,13 +88,9 @@ def store_tracer(self):
         """Add the current tracer to thread_local"""
         execution_context.set_opencensus_tracer(self)
 
-    def start_trace(self):
-        """Start a trace."""
-        self.tracer.start_trace()
-
-    def end_trace(self):
-        """End a trace and send trace using exporter."""
-        trace = self.tracer.end_trace()
+    def finish(self):
+        """End all spans and send spans using reporter."""
+        trace = self.tracer.finish()
 
         if trace is not None:
             self.exporter.export(trace)

trace/opencensus/trace/span.py

@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import random
-
+from datetime import datetime
 from itertools import chain
 
-from datetime import datetime
 from opencensus.trace.enums import Enum
+from opencensus.trace.span_context import generate_span_id
 
 
 class Span(object):
@@ -152,17 +151,6 @@ def __exit__(self, exception_type, exception_value, traceback):
         self.finish()
 
 
-def generate_span_id():
-    """Return the random generated span ID for a span.
-
-    :rtype: int
-    :returns: Identifier for the span. Must be a 64-bit integer other
-              than 0 and unique within a trace.
-    """
-    span_id = random.getrandbits(64)
-    return span_id
-
-
 def format_span_json(span):
     """Helper to format a Span in JSON format.
 

trace/opencensus/trace/span_context.py

@@ -15,9 +15,9 @@
 """SpanContext encapsulates the current context within the request's trace."""
 
 import logging
+import random
 import re
-
-from opencensus.trace import trace
+import uuid
 
 _INVALID_TRACE_ID = '0' * 32
 _INVALID_SPAN_ID = 0
@@ -51,7 +51,7 @@ def __init__(
             enabled=True,
             from_header=False):
         if trace_id is None:
-            trace_id = trace.generate_trace_id()
+            trace_id = generate_trace_id()
 
         self.trace_id = self.check_trace_id(trace_id)
         self.span_id = self.check_span_id(span_id)
@@ -121,7 +121,7 @@ def check_trace_id(self, trace_id):
                 'Trace_id {} is invalid (cannot be all zero), '
                 'generate a new one.'.format(trace_id))
             self.from_header = False
-            return trace.generate_trace_id()
+            return generate_trace_id()
 
         trace_id_pattern = re.compile(_TRACE_ID_FORMAT)
 
@@ -134,4 +134,25 @@ def check_trace_id(self, trace_id):
                 'Trace_id {} does not the match the required format,'
                 'generate a new one instead.'.format(trace_id))
             self.from_header = False
-            return trace.generate_trace_id()
+            return generate_trace_id()
+
+
+def generate_span_id():
+    """Return the random generated span ID for a span.
+
+    :rtype: int
+    :returns: Identifier for the span. Must be a 64-bit integer other
+              than 0 and unique within a trace.
+    """
+    span_id = random.getrandbits(64)
+    return span_id
+
+
+def generate_trace_id():
+    """Generate a trace_id randomly.
+
+    :rtype: str
+    :returns: 32 digit randomly generated trace ID.
+    """
+    trace_id = uuid.uuid4().hex
+    return trace_id

trace/opencensus/trace/trace.py

@@ -18,20 +18,8 @@ class Tracer(object):
 
     Subclasses of :class:`Tracer` must implement the below methods.
     """
-    def trace(self):
-        """Create a trace using the context information.
-
-        :rtype: :class:`~opencensus.trace.trace.Trace`
-        :returns: The Trace object.
-        """
-        raise NotImplementedError
-
-    def start_trace(self):
-        """Start a trace."""
-        raise NotImplementedError
-
-    def end_trace(self):
-        """End a trace."""
+    def finish(self):
+        """End the spans and send to reporters."""
         raise NotImplementedError
 
     def span(self, name='span'):

trace/opencensus/trace/tracer/base.py

@@ -17,7 +17,6 @@
 from opencensus.trace.span_context import SpanContext
 from opencensus.trace import labels_helper
 from opencensus.trace import span as trace_span
-from opencensus.trace.trace import Trace
 from opencensus.trace.tracer import base
 
 
@@ -34,24 +33,16 @@ def __init__(self, span_context=None):
 
         self.span_context = span_context
         self.trace_id = span_context.trace_id
-        self.cur_trace = self.trace()
-        self._span_stack = []
         self.root_span_id = span_context.span_id
 
-    def trace(self):
-        """Create a trace using the context information.
-
-        :rtype: :class:`~opencensus.trace.trace.Trace`
-        :returns: The Trace object.
-        """
-        return Trace(trace_id=self.trace_id)
+        # Stack which maintains nested spans
+        self._span_stack = []
 
-    def start_trace(self):
-        """Start a trace."""
-        self.cur_trace.start()
+        # List of spans to report
+        self._spans_list = []
 
-    def end_trace(self):
-        """End a trace.
+    def finish(self):
+        """Finish all spans
 
         :rtype: dict
         :returns: JSON format trace.
@@ -61,7 +52,6 @@ def end_trace(self):
         helper.set_labels()
 
         trace = self._get_trace_json()
-        self.cur_trace.finish()
 
         return trace
 
@@ -91,7 +81,7 @@ def start_span(self, name='span'):
             name,
             parent_span_id=parent_span_id,
             context_tracer=self)
-        self.cur_trace.spans.append(span)
+        self._spans_list.append(span)
         self._span_stack.append(span)
         self.span_context.span_id = span.span_id
         span.start()
@@ -123,7 +113,7 @@ def current_span(self):
         return cur_span
 
     def list_collected_spans(self):
-        return self.cur_trace.spans
+        return self._spans_list
 
     def add_label_to_current_span(self, label_key, label_value):
         """Add label to current span.
@@ -146,13 +136,13 @@ def add_label_to_spans(self, label_key, label_value):
         :type label_value:str
         :param label_value: Label value.
         """
-        for span in self.cur_trace.spans:
+        for span in self._spans_list:
             span.add_label(label_key, label_value)
 
     def _get_trace_json(self):
         """Get the JSON format trace."""
         spans_list = []
-        for root_span in self.cur_trace.spans:
+        for root_span in self._spans_list:
             span_tree = list(iter(root_span))
             span_tree_json = [trace_span.format_span_json(span)
                               for span in span_tree]
@@ -162,7 +152,7 @@ def _get_trace_json(self):
             return
 
         trace = {
-            'traceId': self.cur_trace.trace_id,
+            'traceId': self.trace_id,
             'spans': spans_list,
         }
 

trace/opencensus/trace/tracer/context_tracer.py

@@ -19,20 +19,8 @@ class NoopTracer(base.Tracer):
     """No-op implementation of the :class:`Tracer` interface, all methods are
     no-ops. Should be used when tracing is not enabled or not sampled.
     """
-    def trace(self):
-        """Create a trace using the context information.
-
-        :rtype: :class:`~opencensus.trace.trace.Trace`
-        :returns: The Trace object.
-        """
-        return base.NullContextManager()
-
-    def start_trace(self):
-        """Start a trace."""
-        return
-
-    def end_trace(self):
-        """End a trace."""
+    def finish(self):
+        """End spans and send to reporter."""
         return None
 
     def span(self, name='span'):